From: Dylan Reid Date: Tue, 3 Mar 2015 17:38:28 +0000 (-0800) Subject: power: Remove HAS_WAKELOCK config and document WAKELOCK X-Git-Tag: firefly_0821_release~2958^2~174 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e710ba39fabd14b7236b42c00a33e105a04e5245;p=firefly-linux-kernel-4.4.55.git 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 --- 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