summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2012-04-19 11:18:25 -0700
committerJohn Stultz <john.stultz@linaro.org>2012-05-21 16:04:41 -0700
commit8c117a0d2fd3380deb63f812faf53b30f20dbc13 (patch)
tree003da158eb5102cee0a81d60d38d02316e7fa23d /kernel
parentdc96eaf91604ea028d400ca752d63eac3254a50e (diff)
config: Set Andorid config options to default n
Tixy noted some problems using combined source trees to build ubuntu kernels, as some Android features default on. This patch changes them to default N. Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 1e9acb47e9f..63cad888e24 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -20,16 +20,16 @@ config SUSPEND_FREEZER
config HAS_WAKELOCK
bool
- default y
+ default n
config WAKELOCK
bool
- default y
+ default n
config USER_WAKELOCK
bool "Userspace wake locks"
depends on PM_SLEEP
- default y
+ default n
---help---
User-space wake lock api. Write "lockname" or "lockname timeout"
to /sys/power/wake_lock lock and if needed create a wake lock.