|
@@ -85,7 +85,7 @@ config PM_TRACE_RTC
|
|
|
config PM_SLEEP_SMP
|
|
|
bool
|
|
|
depends on SMP
|
|
|
- depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
|
|
|
+ depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
|
|
|
depends on PM_SLEEP
|
|
|
select HOTPLUG_CPU
|
|
|
default y
|
|
@@ -95,29 +95,14 @@ config PM_SLEEP
|
|
|
depends on SUSPEND || HIBERNATION
|
|
|
default y
|
|
|
|
|
|
-config SUSPEND_UP_POSSIBLE
|
|
|
- bool
|
|
|
- depends on (X86 && !X86_VOYAGER) || PPC || ARM || BLACKFIN || MIPS \
|
|
|
- || SUPERH || FRV
|
|
|
- depends on !SMP
|
|
|
- default y
|
|
|
-
|
|
|
-config SUSPEND_SMP_POSSIBLE
|
|
|
- bool
|
|
|
- depends on (X86 && !X86_VOYAGER) \
|
|
|
- || (PPC && (PPC_PSERIES || PPC_PMAC)) || ARM
|
|
|
- depends on SMP
|
|
|
- default y
|
|
|
-
|
|
|
config SUSPEND
|
|
|
bool "Suspend to RAM and standby"
|
|
|
- depends on PM
|
|
|
- depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE
|
|
|
+ depends on PM && ARCH_SUSPEND_POSSIBLE
|
|
|
default y
|
|
|
---help---
|
|
|
Allow the system to enter sleep states in which main memory is
|
|
|
powered and thus its contents are preserved, such as the
|
|
|
- suspend-to-RAM state (i.e. the ACPI S3 state).
|
|
|
+ suspend-to-RAM state (e.g. the ACPI S3 state).
|
|
|
|
|
|
config HIBERNATION
|
|
|
bool "Hibernation (aka 'suspend to disk')"
|