From cda87cd1b2a9f59637ed10a1680436490ba241d4 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 26 Jan 2010 17:08:57 +0000 Subject: [PATCH] debian/config: Order. svn path=/dists/trunk/linux-2.6/; revision=15012 --- debian/config/config | 3 +-- debian/config/kernelarch-x86/config | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/config/config b/debian/config/config index 25a0ee259..540a3668a 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3213,8 +3213,7 @@ CONFIG_HZ_250=y ## 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="" diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 33be3537f..dfaed9ef1 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1292,16 +1292,16 @@ CONFIG_SUN_PARTITION=y CONFIG_EFI_PARTITION=y ## -## file: kernel/trace/Kconfig -## -# CONFIG_MMIOTRACE is not set - -## -## file: drivers/power/Kconfig +## file: kernel/power/Kconfig ## CONFIG_PM_TRACE_RTC=y CONFIG_PM_TEST_SUSPEND=y +## +## file: kernel/trace/Kconfig +## +# CONFIG_MMIOTRACE is not set + ## ## file: lib/Kconfig.debug ##