diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-08-31 02:56:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 04:42:22 -0400 |
| commit | f3de4be9d5f8551d7880a1f1f5231a30e0161b1f (patch) | |
| tree | 9ebd397e6b253d144460f061b95ded60a7b0da0b /arch | |
| parent | b07e35f94a7b6a059f889b904529ee907dc0634d (diff) | |
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')
| -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 e64f65c9d901..b091c5e35558 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/defconfig | |||
| @@ -201,7 +201,6 @@ CONFIG_PM=y | |||
| 201 | # CONFIG_PM_DEBUG is not set | 201 | # CONFIG_PM_DEBUG is not set |
| 202 | CONFIG_HIBERNATION=y | 202 | CONFIG_HIBERNATION=y |
| 203 | CONFIG_PM_STD_PARTITION="" | 203 | CONFIG_PM_STD_PARTITION="" |
| 204 | CONFIG_SUSPEND_SMP=y | ||
| 205 | 204 | ||
| 206 | # | 205 | # |
| 207 | # ACPI (Advanced Configuration and Power Interface) Support | 206 | # ACPI (Advanced Configuration and Power Interface) Support |