Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

[cascardo/linux.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index deb5461..8f9b4eb 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -103,6 +103,33 @@ config PM_SLEEP_SMP
        select HOTPLUG
        select HOTPLUG_CPU
 
+config PM_AUTOSLEEP
+       bool "Opportunistic sleep"
+       depends on PM_SLEEP
+       default n
+       ---help---
+       Allow the kernel to trigger a system transition into a global sleep
+       state automatically whenever there are no active wakeup sources.
+
+config PM_WAKELOCKS
+       bool "User space wakeup sources interface"
+       depends on PM_SLEEP
+       default n
+       ---help---
+       Allow user space to create, activate and deactivate wakeup source
+       objects with the help of a sysfs-based interface.
+
+config PM_WAKELOCKS_LIMIT
+       int "Maximum number of user space wakeup sources (0 = no limit)"
+       range 0 100000
+       default 100
+       depends on PM_WAKELOCKS
+
+config PM_WAKELOCKS_GC
+       bool "Garbage collector for user space wakeup sources"
+       depends on PM_WAKELOCKS
+       default y
+
 config PM_RUNTIME
        bool "Run-time PM core functionality"
        depends on !IA64_HP_SIM