[IPSEC] xfrm_user: Kill PAGE_SIZE check in verify_sec_ctx_len()

[powerpc.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index c14cd99..9fd8d4f 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -1,5 +1,6 @@
 config PM
        bool "Power Management support"
 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
        ---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.
 
          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
 config PM_DEBUG
        bool "Power Management Debug Support"
        depends on PM


@@ -28,7 +38,7 @@ config PM_DEBUG
 
 config SOFTWARE_SUSPEND
        bool "Software Suspend"
 
 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.
        ---help---
          Enable the possibility of suspending the machine.
          It doesn't need APM.