[kernel] r15012 - in dists/trunk/linux-2.6/debian/config: . kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Tue Jan 26 17:08:57 2010
New Revision: 15012

Log:
debian/config: Order.

Modified:
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Jan 26 16:58:55 2010	(r15011)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Jan 26 17:08:57 2010	(r15012)
@@ -3213,8 +3213,7 @@
 ##
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_VERBOSE is not set 
-CONFIG_PM_TRACE=y 
+# CONFIG_PM_VERBOSE is not set
 CONFIG_SUSPEND=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jan 26 16:58:55 2010	(r15011)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jan 26 17:08:57 2010	(r15012)
@@ -1292,15 +1292,15 @@
 CONFIG_EFI_PARTITION=y
 
 ##
-## file: kernel/trace/Kconfig
+## file: kernel/power/Kconfig
 ##
-# CONFIG_MMIOTRACE is not set
+CONFIG_PM_TRACE_RTC=y
+CONFIG_PM_TEST_SUSPEND=y
 
 ##
-## file: drivers/power/Kconfig
+## file: kernel/trace/Kconfig
 ##
-CONFIG_PM_TRACE_RTC=y
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_MMIOTRACE is not set
 
 ##
 ## file: lib/Kconfig.debug