diff options
author | Mark Brown <broonie@linaro.org> | 2013-12-09 11:37:00 +0000 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-12-09 11:37:00 +0000 |
commit | eed4bafd63b5584adb832a582a931ecba41dec55 (patch) | |
tree | 5855807caaf53aec80037b2635eb2e2c0744565b /kernel/power/Kconfig | |
parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
parent | 2c06cb20454795a38876be5bd93dd6a8ddcc9d98 (diff) |
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aosp
Diffstat (limited to 'kernel/power/Kconfig')
-rw-r--r-- | kernel/power/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 5dfdc9ea180..f8cc6c43efe 100644 --- 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 @@ -274,3 +282,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 |