aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-12-07 20:14:00 -0500
committerLen Brown <len.brown@intel.com>2008-02-01 18:30:55 -0500
commitf4cb57007662a4ec3c2de3c027900223e0299bdd (patch)
treeec0c277f3cae26594714c458ad40b1e0e5aca484 /kernel/power
parent801e4062fda6496fe9bee3e6915a2aa108f974e5 (diff)
Suspend: Clean up Kconfig (V2)
This cleans up the suspend Kconfig and removes the need to declare centrally which architectures support suspend. All architectures that currently support suspend are modified accordingly. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Russell King <rmk@arm.linux.org.uk> Acked-by: Paul Mackerras <paulus@samba.org> Acked-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Paul Mundt <lethal@linux-sh.org> Cc: Pavel Machek <pavel@suse.cz> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/Kconfig21
1 files changed, 3 insertions, 18 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index fd76d54910d0..f8153fda06bb 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -85,7 +85,7 @@ config PM_TRACE_RTC
85config PM_SLEEP_SMP 85config PM_SLEEP_SMP
86 bool 86 bool
87 depends on SMP 87 depends on SMP
88 depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE 88 depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
89 depends on PM_SLEEP 89 depends on PM_SLEEP
90 select HOTPLUG_CPU 90 select HOTPLUG_CPU
91 default y 91 default y
@@ -95,29 +95,14 @@ config PM_SLEEP
95 depends on SUSPEND || HIBERNATION 95 depends on SUSPEND || HIBERNATION
96 default y 96 default y
97 97
98config SUSPEND_UP_POSSIBLE
99 bool
100 depends on (X86 && !X86_VOYAGER) || PPC || ARM || BLACKFIN || MIPS \
101 || SUPERH || FRV
102 depends on !SMP
103 default y
104
105config SUSPEND_SMP_POSSIBLE
106 bool
107 depends on (X86 && !X86_VOYAGER) \
108 || (PPC && (PPC_PSERIES || PPC_PMAC)) || ARM
109 depends on SMP
110 default y
111
112config SUSPEND 98config SUSPEND
113 bool "Suspend to RAM and standby" 99 bool "Suspend to RAM and standby"
114 depends on PM 100 depends on PM && ARCH_SUSPEND_POSSIBLE
115 depends on SUSPEND_UP_POSSIBLE || SUSPEND_SMP_POSSIBLE
116 default y 101 default y
117 ---help--- 102 ---help---
118 Allow the system to enter sleep states in which main memory is 103 Allow the system to enter sleep states in which main memory is
119 powered and thus its contents are preserved, such as the 104 powered and thus its contents are preserved, such as the
120 suspend-to-RAM state (i.e. the ACPI S3 state). 105 suspend-to-RAM state (e.g. the ACPI S3 state).
121 106
122config HIBERNATION 107config HIBERNATION
123 bool "Hibernation (aka 'suspend to disk')" 108 bool "Hibernation (aka 'suspend to disk')"