SOURCES: kernel-desktop-i386.config, kernel-desktop-i386-smp.confi...

Tue Jun 13 01:19:46 CEST 2006

Author: sparky                       Date: Mon Jun 12 23:19:46 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- sorted

---- Files affected:
SOURCES:
   kernel-desktop-i386.config (1.1 -> 1.2) , kernel-desktop-i386-smp.config (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-i386.config
diff -u SOURCES/kernel-desktop-i386.config:1.1 SOURCES/kernel-desktop-i386.config:1.2

--- SOURCES/kernel-desktop-i386.config:1.1	Tue Jun 13 00:54:13 2006
+++ SOURCES/kernel-desktop-i386.config	Tue Jun 13 01:19:41 2006
@@ -59,6 +59,10 @@
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
+
+#
+# RCU implementation type:
+#
 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_LOCAL_APIC=y
@@ -103,11 +107,55 @@
 CONFIG_BOOT_IOREMAP=y
 # CONFIG_REGPARM is not set
 CONFIG_SECCOMP=y
+
+#
+# Timer frequency
+#
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x100000
 
 #
+# Power management options (ACPI, APM)
+#
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_SLEEP_PROC_FS=y
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_HOTKEY=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_ASUS=m
+CONFIG_ACPI_IBM=m
+# CONFIG_ACPI_IBM_DOCK is not set
+CONFIG_ACPI_TOSHIBA=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_SYSTEM=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=m
+CONFIG_APM=m
+# CONFIG_APM_IGNORE_USER_SUSPEND is not set
+# CONFIG_APM_DO_ENABLE is not set
+CONFIG_APM_CPU_IDLE=y
+# CONFIG_APM_DISPLAY_BLANK is not set
+# CONFIG_APM_RTC_IS_GMT is not set
+# CONFIG_APM_ALLOW_INTS is not set
+CONFIG_APM_REAL_MODE_POWER_OFF=y
+
+#
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
@@ -181,9 +229,7 @@
 # CONFIG_MCA is not set
 CONFIG_SCx200=m
 
-#
-# Instrumentation Support
-#
+
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
 # CONFIG_KPROBES is not set
@@ -221,52 +267,11 @@
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_DOUBLEFAULT=y
+
+#
+# Library routines
+#
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_KTIME_SCALAR=y
-
-# Power management options (ACPI, APM)
-#
-
-#
-# ACPI (Advanced Configuration and Power Interface) Support
-#
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SLEEP_PROC_FS=y
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_IBM=m
-# CONFIG_ACPI_IBM_DOCK is not set
-CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
-CONFIG_APM=m
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_RTC_IS_GMT is not set
-# CONFIG_APM_ALLOW_INTS is not set
-CONFIG_APM_REAL_MODE_POWER_OFF=y
-
-

================================================================
Index: SOURCES/kernel-desktop-i386-smp.config
diff -u SOURCES/kernel-desktop-i386-smp.config:1.1 SOURCES/kernel-desktop-i386-smp.config:1.2
--- SOURCES/kernel-desktop-i386-smp.config:1.1	Tue Jun 13 00:54:13 2006
+++ SOURCES/kernel-desktop-i386-smp.config	Tue Jun 13 01:19:41 2006
@@ -62,6 +62,10 @@
 CONFIG_NR_CPUS=16
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+
+#
+# RCU implementation type:
+#
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_MCE=y
@@ -105,6 +109,7 @@
 CONFIG_BOOT_IOREMAP=y
 # CONFIG_REGPARM is not set
 CONFIG_SECCOMP=y
+
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x100000
@@ -141,10 +146,6 @@
 CONFIG_ACPI_SYSTEM=y
 CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
-
-#
-# APM (Advanced Power Management) BIOS Support
-#
 CONFIG_APM=m
 # CONFIG_APM_IGNORE_USER_SUSPEND is not set
 # CONFIG_APM_DO_ENABLE is not set
@@ -228,9 +229,7 @@
 # CONFIG_MCA is not set
 CONFIG_SCx200=m
 
-#
-# Instrumentation Support
-#
+
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
 # CONFIG_KPROBES is not set
@@ -268,6 +267,7 @@
 CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_MPPARSE=y
 CONFIG_DOUBLEFAULT=y
+
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_PENDING_IRQ=y
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-i386.config?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/kernel-desktop-i386-smp.config?r1=1.1&r2=1.2&f=u

