SOURCES: kernel-desktop-x86_64.config - sorted

[sparky]

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

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

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-x86_64.config
diff -u SOURCES/kernel-desktop-x86_64.config:1.2 SOURCES/kernel-desktop-x86_64.config:1.3
--- SOURCES/kernel-desktop-x86_64.config:1.2	Tue Jun 13 01:05:05 2006
+++ SOURCES/kernel-desktop-x86_64.config	Tue Jun 13 01:14:13 2006
@@ -3,7 +3,6 @@
 CONFIG_X86=y
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_MMU=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_X86_CMPXCHG=y
@@ -14,10 +13,6 @@
 CONFIG_DMI=y
 
 #
-# Processor type and features
-#
-
-#
 # Subarchitecture Type
 #
 CONFIG_X86_PC=y
@@ -41,6 +36,11 @@
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_MTRR=y
 # CONFIG_SMP is not set
+
+#
+# RCU implementation type:
+#
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_HPET_TIMER=y
@@ -60,8 +60,33 @@
 CONFIG_ISA_DMA_API=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
@@ -123,9 +148,7 @@
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 
-#
-# Instrumentation Support
-#
+
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=m
 # CONFIG_KPROBES is not set
@@ -151,34 +174,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.config?r1=1.2&r2=1.3&f=u