Driver core: deprecate PM_LEGACY, default it to N

[profile/ivi/kernel-adaptation-intel-automotive.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 825068c..ed29622 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -20,13 +20,14 @@ config PM
          sending the processor to sleep and saving power.
 
 config PM_LEGACY
-       bool "Legacy Power Management API"
+       bool "Legacy Power Management API (DEPRECATED)"
        depends on PM
-       default y
+       default n
        ---help---
-          Support for pm_register() and friends.
+          Support for pm_register() and friends.  This old API is obsoleted
+          by the driver model.
 
-          If unsure, say Y.
+          If unsure, say N.
 
 config PM_DEBUG
        bool "Power Management Debug Support"
@@ -78,7 +79,7 @@ config PM_SYSFS_DEPRECATED
 
 config SOFTWARE_SUSPEND
        bool "Software Suspend"
-       depends on PM && SWAP && ((X86 && (!SMP || SUSPEND_SMP) && !X86_PAE) || ((FRV || 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 ACPI or APM.