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>

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
 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')"