Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[linux-2.6] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 4b6e2f18e0569321cd07d3283b9082c3a5abf298..ed296225dcd4a66119d6785d64ddd488cc77f24c 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"
@@ -64,10 +65,21 @@ config PM_TRACE
        CAUTION: this option will cause your machine's real-time clock to be
        set to an invalid time after a resume.
 
+config PM_SYSFS_DEPRECATED
+       bool "Driver model /sys/devices/.../power/state files (DEPRECATED)"
+       depends on PM && SYSFS
+       default n
+       help
+         The driver model started out with a sysfs file intended to provide
+         a userspace hook for device power management.  This feature has never
+         worked very well, except for limited testing purposes, and so it will
+         be removed.   It's not clear that a generic mechanism could really
+         handle the wide variability of device power states; any replacements
+         are likely to be bus or driver specific.
 
 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.