X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=kernel%2Fpower%2FKconfig;h=9fd8d4f03595130e524ca4d4d62136290484a422;hb=253aa11578c1b89757282430891bb66ae5300092;hp=c14cd99911818c893294c52afff301b58e729554;hpb=db400b3c4ee89d384d9163836a55577abdae772d;p=powerpc.git

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index c14cd99911..9fd8d4f035 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -1,5 +1,6 @@
 config PM
 	bool "Power Management support"
+	depends on !IA64_HP_SIM
 	---help---
 	  "Power Management" means that parts of your computer are shut
 	  off or put into a power conserving "sleep" mode if they are not
@@ -18,6 +19,15 @@ config PM
 	  will issue the hlt instruction if nothing is to be done, thereby
 	  sending the processor to sleep and saving power.
 
+config PM_LEGACY
+	bool "Legacy Power Management API"
+	depends on PM
+	default y
+	---help---
+	   Support for pm_register() and friends.
+
+	   If unsure, say Y.
+
 config PM_DEBUG
 	bool "Power Management Debug Support"
 	depends on PM
@@ -28,7 +38,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)) || ((FRV || PPC32) && !SMP)
 	---help---
 	  Enable the possibility of suspending the machine.
 	  It doesn't need APM.