1 files changed, 3 insertions, 15 deletions

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 06a08f7cebda..fd76d54910d0 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -84,7 +84,8 @@ config PM_TRACE_RTC
 
 config PM_SLEEP_SMP
         bool
-        depends on SUSPEND_SMP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
+        depends on SMP
+        depends on SUSPEND_SMP_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
         depends on PM_SLEEP
         select HOTPLUG_CPU
         default y
@@ -118,22 +119,9 @@ config SUSPEND
           powered and thus its contents are preserved, such as the
           suspend-to-RAM state (i.e. the ACPI S3 state).
 
-config HIBERNATION_UP_POSSIBLE
-        bool
-        depends on X86 || PPC64_SWSUSP || PPC32
-        depends on !SMP
-        default y
-
-config HIBERNATION_SMP_POSSIBLE
-        bool
-        depends on (X86 && !X86_VOYAGER) || PPC64_SWSUSP
-        depends on SMP
-        default y
-
 config HIBERNATION
         bool "Hibernation (aka 'suspend to disk')"
-        depends on PM && SWAP
-        depends on HIBERNATION_UP_POSSIBLE || HIBERNATION_SMP_POSSIBLE
+        depends on PM && SWAP && ARCH_HIBERNATION_POSSIBLE
         ---help---
           Enable the suspend to disk (STD) functionality, which is usually
           called "hibernation" in user interfaces.  STD checkpoints the