SOURCES: kernel-desktop-x86_64-smp.config - sorted

[sparky]

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

---- Files affected:
SOURCES:
   kernel-desktop-x86_64-smp.config (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-x86_64-smp.config
diff -u SOURCES/kernel-desktop-x86_64-smp.config:1.2 SOURCES/kernel-desktop-x86_64-smp.config:1.3
--- SOURCES/kernel-desktop-x86_64-smp.config:1.2	Tue Jun 13 01:05:05 2006
+++ SOURCES/kernel-desktop-x86_64-smp.config	Tue Jun 13 01:15:58 2006
@@ -3,7 +3,6 @@
 CONFIG_X86=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_MMU=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_X86_CMPXCHG=y
 CONFIG_EARLY_PRINTK=y
@@ -13,10 +12,6 @@
 CONFIG_DMI=y
 
 #
-# Processor type and features
-#
-
-#
 # Subarchitecture Type
 #
 CONFIG_X86_PC=y
@@ -42,7 +37,12 @@
 CONFIG_SMP=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+
+#
+# RCU implementation type:
+#
 CONFIG_NUMA=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_K8_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 # CONFIG_NUMA_EMU is not set
@@ -63,6 +63,7 @@
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x100000
 CONFIG_SECCOMP=y
+
 CONFIG_REORDER=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -70,8 +71,33 @@
 CONFIG_GENERIC_PENDING_IRQ=y
 
 #
-# Power management options
+# 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=y
+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_ACPI_HOTPLUG_MEMORY=m
 
 #
 # CPU Frequency scaling
@@ -133,9 +159,7 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-#
-# Instrumentation Support
-#
+
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
 # CONFIG_KPROBES is not set
@@ -163,34 +187,3 @@
 CONFIG_RCU_TORTURE_TEST=m
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_IOMMU_DEBUG is not set
-
-#
-# 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=y
-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_ACPI_HOTPLUG_MEMORY=m
-
-
================================================================

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