Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6-omap-h63xx.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index ae44a70aae8acb4664ca46107d04525205c32ad6..95f6657fff73432880d14bd96e6304eea4aacff6 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"
@@ -36,6 +37,17 @@ config PM_DEBUG
        code. This is helpful when debugging and reporting various PM bugs, 
        like suspend support.
 
+config DISABLE_CONSOLE_SUSPEND
+       bool "Keep console(s) enabled during suspend/resume (DANGEROUS)"
+       depends on PM && PM_DEBUG
+       default n
+       ---help---
+       This option turns off the console suspend mechanism that prevents
+       debug messages from reaching the console during the suspend/resume
+       operations.  This may be helpful when debugging device drivers'
+       suspend/resume routines, but may itself lead to problems, for example
+       if netconsole is used.
+
 config PM_TRACE
        bool "Suspend/resume event tracing"
        depends on PM && PM_DEBUG && X86_32 && EXPERIMENTAL
@@ -53,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)) || ((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.
@@ -78,6 +101,10 @@ config SOFTWARE_SUSPEND
 
          For more information take a look at <file:Documentation/power/swsusp.txt>.
 
+         (For now, swsusp is incompatible with PAE aka HIGHMEM_64G on i386.
+         we need identity mapping for resume to work, and that is trivial
+         to get with 4MB pages, but less than trivial on PAE).
+
 config PM_STD_PARTITION
        string "Default resume partition"
        depends on SOFTWARE_SUSPEND
@@ -104,3 +131,29 @@ config SUSPEND_SMP
        bool
        depends on HOTPLUG_CPU && X86 && PM
        default y
+
+config APM_EMULATION
+       tristate "Advanced Power Management Emulation"
+       depends on PM && SYS_SUPPORTS_APM_EMULATION
+       help
+         APM is a BIOS specification for saving power using several different
+         techniques. This is mostly useful for battery powered laptops with
+         APM compliant BIOSes. If you say Y here, the system time will be
+         reset after a RESUME operation, the /proc/apm device will provide
+         battery status information, and user-space programs will receive
+         notification of APM "events" (e.g. battery status change).
+
+         In order to use APM, you will need supporting software. For location
+         and more information, read <file:Documentation/pm.txt> and the
+         Battery Powered Linux mini-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>.
+
+         This driver does not spin down disk drives (see the hdparm(8)
+         manpage ("man 8 hdparm") for that), and it doesn't turn off
+         VESA-compliant "green" monitors.
+
+         Generally, if you don't have a battery in your machine, there isn't
+         much point in using this driver and you should say N. If you get
+         random kernel OOPSes or reboots that don't seem to be related to
+         anything, try disabling/enabling this option (or disabling/enabling
+         APM in your BIOS).