diff --git a/[refs] b/[refs]
index 89a2edfc577f..b4b854432460 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21d6b7e18f70c847c867aafb3109405b48424388
+refs/heads/master: 19c324397a55edf122822f829779b46b9cb385dd
diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig
index fdb377636505..2c7121d9bff1 100644
--- a/trunk/kernel/power/Kconfig
+++ b/trunk/kernel/power/Kconfig
@@ -27,8 +27,8 @@ config PM_DEBUG
 	like suspend support.
 
 config SOFTWARE_SUSPEND
-	bool "Software Suspend (EXPERIMENTAL)"
-	depends on EXPERIMENTAL && PM && SWAP && (SUSPEND_SMP || !SMP)
+	bool "Software Suspend"
+	depends on EXPERIMENTAL && PM && SWAP && ((X86 && SMP) || ((FVR || PPC32 || X86) && !SMP))
 	---help---
 	  Enable the possibility of suspending the machine.
 	  It doesn't need APM.