Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel...

[firefly-linux-kernel-4.4.55.git] / kernel / power / Kconfig

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 46455961a88fb75c3ce4e426c4f9b8ff022ecbcc..7a297aeeca9ede3c2c400e5bedb264c24b2df2b1 100644 (file)
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -18,6 +18,14 @@ config SUSPEND_FREEZER
 
          Turning OFF this setting is NOT recommended! If in doubt, say Y.
 
+config HAS_WAKELOCK
+       bool
+       default y
+
+config WAKELOCK
+       bool
+       default y
+
 config HIBERNATE_CALLBACKS
        bool
 
@@ -294,3 +302,10 @@ config PM_GENERIC_DOMAINS_RUNTIME
 config CPU_PM
        bool
        depends on SUSPEND || CPU_IDLE
+
+config SUSPEND_TIME
+       bool "Log time spent in suspend"
+       ---help---
+         Prints the time spent in suspend in the kernel log, and
+         keeps statistics on the time spent in suspend in
+         /sys/kernel/debug/suspend_time