diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-04-19 11:18:25 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-05-21 16:04:41 -0700 |
| commit | 8c117a0d2fd3380deb63f812faf53b30f20dbc13 (patch) | |
| tree | 003da158eb5102cee0a81d60d38d02316e7fa23d | |
| parent | dc96eaf91604ea028d400ca752d63eac3254a50e (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>
| -rw-r--r-- | kernel/power/Kconfig | 6 | ||||
| -rw-r--r-- | net/Kconfig | 4 |
2 files changed, 5 insertions, 5 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. diff --git a/net/Kconfig b/net/Kconfig index c8ee300cb96..f4e0c23be13 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -81,13 +81,13 @@ endif # if INET config ANDROID_PARANOID_NETWORK bool "Only allow certain groups to create sockets" - default y + default n help none config NET_ACTIVITY_STATS bool "Network activity statistics tracking" - default y + default n help Network activity statistics are useful for tracking wireless modem activity on 2G, 3G, 4G wireless networks. Counts number of |