diff --git a/[refs] b/[refs]
index b1d4544b96c3..3e9fd1460cb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 244bc050d5c9431682b7d834aff92e663fe88bb2
+refs/heads/master: 720b9429e8f41f7c4ee9df293403650905042035
diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig
index 396c7873e804..46a5e5acff97 100644
--- a/trunk/kernel/power/Kconfig
+++ b/trunk/kernel/power/Kconfig
@@ -29,7 +29,7 @@ config PM_DEBUG
 
 config SOFTWARE_SUSPEND
 	bool "Software Suspend"
-	depends on PM && SWAP && (X86 || ((FVR || PPC32) && !SMP))
+	depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FVR || PPC32) && !SMP)
 	---help---
 	  Enable the possibility of suspending the machine.
 	  It doesn't need APM.