diff --git a/[refs] b/[refs]
index abbdd0bf89a5..86ea915f5e74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e51762759db9e26c6c3e4e1010d80a50c62ca03
+refs/heads/master: af998a9a0ae3291e86ddcae8e196a1cbf82c2457
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 9d9baeb0784f..61284165ea7a 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -87,10 +87,17 @@ config GENERIC_LOCKBREAK
 
 config SYS_SUPPORTS_PM
 	bool
+	depends on !SMP
+
+config ARCH_SUSPEND_POSSIBLE
+	def_bool n
+
+config ARCH_HIBERNATION_POSSIBLE
+	def_bool n
 
 config SYS_SUPPORTS_APM_EMULATION
 	bool
-	select SYS_SUPPORTS_PM
+	select ARCH_SUSPEND_POSSIBLE
 
 config SYS_SUPPORTS_SMP
 	bool
@@ -755,11 +762,7 @@ source "fs/Kconfig.binfmt"
 endmenu
 
 menu "Power management options (EXPERIMENTAL)"
-depends on EXPERIMENTAL && SYS_SUPPORTS_PM
-
-config ARCH_SUSPEND_POSSIBLE
-	def_bool y
-	depends on !SMP
+depends on EXPERIMENTAL
 
 source kernel/power/Kconfig