summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2015-03-03 09:38:28 -0800
committerJohn Stultz <john.stultz@linaro.org>2016-02-16 13:53:40 -0800
commite710ba39fabd14b7236b42c00a33e105a04e5245 (patch)
tree33e80f9b2957f0acf10242f48fae908dbdb41197 /kernel
parent49f054b7c5fc79fc33560f623f7a2f2bbd92cf08 (diff)
power: Remove HAS_WAKELOCK config and document WAKELOCK
Remove the HAS_WAKELOCK config as it doesn't seem to have been used in the 3.10 or 3.14 kernels. Add some Documentation to CONFIG_WAKELOCK so that it is selectable and can be disabled is desired. Signed-off-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/Kconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index deb2df6a7129..84c480946fb2 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -29,8 +29,13 @@ config SUSPEND_SKIP_SYNC
user-space before invoking suspend. Say Y if that's your case.
config WAKELOCK
- bool
+ bool "Android's method of preventing suspend"
default y
+ ---help---
+ This allows applications to prevent the CPU from suspending while
+ they need it.
+
+ Say Y if you are running an android userspace.
config HIBERNATE_CALLBACKS
bool