diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-04-09 19:44:07 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-04-09 19:44:07 -0700 |
| commit | 9c618ddef1e9d5b422b7ae16db6a4dcdcfb07139 (patch) | |
| tree | dc9c8808ec27380e7da3e0288bfc1093537e0625 | |
| parent | 2de4b7e71d538c83c09c362296f6ca3e00a5b57c (diff) | |
| parent | c1f4f62484f6e5c8808ffbef6bb1853a1557cfdf (diff) | |
Merge branch 'linaro-fixes/experimental/android-3.9' into linaro-android-3.9-experimentaltracking-linaro-android-3.9-llct-20130417.0tracking-linaro-android-3.9-llct-20130415.0tracking-linaro-android-3.9-llct-20130411.0
| -rw-r--r-- | Documentation/android.txt | 4 | ||||
| -rw-r--r-- | drivers/cpufreq/Kconfig | 1 | ||||
| -rw-r--r-- | net/Kconfig | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/android.txt b/Documentation/android.txt index 72a62afdf202..0f40a78b045f 100644 --- a/Documentation/android.txt +++ b/Documentation/android.txt @@ -92,8 +92,8 @@ DNOTIFY 1.3 Recommended enabled config options ------------------------------ ANDROID_PMEM -ANDROID_RAM_CONSOLE -ANDROID_RAM_CONSOLE_ERROR_CORRECTION +PSTORE_CONSOLE +PSTORE_RAM SCHEDSTATS DEBUG_PREEMPT DEBUG_MUTEXES diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index d0a97071d4bf..619001943772 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -172,6 +172,7 @@ config CPU_FREQ_GOV_ONDEMAND config CPU_FREQ_GOV_INTERACTIVE tristate "'interactive' cpufreq policy governor" + default n help 'interactive' - This driver adds a dynamic cpufreq policy governor designed for latency-sensitive workloads. diff --git a/net/Kconfig b/net/Kconfig index 7b57cb7b0d23..a3694a73c9f3 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -83,13 +83,13 @@ endif # if INET config ANDROID_PARANOID_NETWORK bool "Only allow certain groups to create sockets" - default y + default ANDROID help none config NET_ACTIVITY_STATS bool "Network activity statistics tracking" - default y + default ANDROID help Network activity statistics are useful for tracking wireless modem activity on 2G, 3G, 4G wireless networks. Counts number of |