diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-08-30 23:56:29 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 01:42:22 -0700 |
commit | f3de4be9d5f8551d7880a1f1f5231a30e0161b1f (patch) | |
tree | 9ebd397e6b253d144460f061b95ded60a7b0da0b /arch/x86_64/defconfig | |
parent | b07e35f94a7b6a059f889b904529ee907dc0634d (diff) | |
download | op-kernel-dev-f3de4be9d5f8551d7880a1f1f5231a30e0161b1f.zip op-kernel-dev-f3de4be9d5f8551d7880a1f1f5231a30e0161b1f.tar.gz |
PM: Fix dependencies of CONFIG_SUSPEND and CONFIG_HIBERNATION
Dependencies of CONFIG_SUSPEND and CONFIG_HIBERNATION introduced by commit
296699de6bdc717189a331ab6bbe90e05c94db06 "Introduce CONFIG_SUSPEND for
suspend-to-Ram and standby" are incorrect, as they don't cover the facts that
(1) not all architectures support suspend and (2) SMP hibernation is only
possible on X86 and PPC64 (if CONFIG_PPC64_SWSUSP is set).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/defconfig')
-rw-r--r-- | arch/x86_64/defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index e64f65c..b091c5e 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/defconfig @@ -201,7 +201,6 @@ CONFIG_PM=y # CONFIG_PM_DEBUG is not set CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="" -CONFIG_SUSPEND_SMP=y # # ACPI (Advanced Configuration and Power Interface) Support |