diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-04-09 10:52:07 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-04-09 10:52:07 -0700 |
| commit | fa2001cb1111774fcdf7fcb25b3e020a40fd6cde (patch) | |
| tree | b3b3c8f0980898e186ee97212a1e3cf49aee2c3d | |
| parent | 2de4b7e71d538c83c09c362296f6ca3e00a5b57c (diff) | |
| parent | 8b844a627a787fe5aea4cd0ffca7a1461dbefb86 (diff) | |
Merge branch 'linaro-fixes/experimental/android-3.9' into linaro-android-3.9-experimentaltracking-linaro-android-3.9-llct-20130502.0
| -rw-r--r-- | Documentation/android.txt | 7 | ||||
| -rw-r--r-- | drivers/cpufreq/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/usb/otg/Kconfig | 2 | ||||
| -rw-r--r-- | net/Kconfig | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/android.txt b/Documentation/android.txt index 72a62afdf202..adfa4e009d67 100644 --- a/Documentation/android.txt +++ b/Documentation/android.txt @@ -74,9 +74,8 @@ UID_STAT UID16 USB_FUNCTION USB_FUNCTION_ADB -USER_WAKELOCK VIDEO_OUTPUT_CONTROL -WAKELOCK +PM_WAKELOCK YAFFS_AUTO_YAFFS2 YAFFS_FS YAFFS_YAFFS1 @@ -92,8 +91,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/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig index abad470557c0..f57f407be470 100644 --- a/drivers/usb/otg/Kconfig +++ b/drivers/usb/otg/Kconfig @@ -14,7 +14,7 @@ config USB_OTG_UTILS config USB_OTG_WAKELOCK bool "Hold a wakelock when USB connected" - depends on WAKELOCK + depends on PM_WAKELOCK select USB_OTG_UTILS help Select this to automatically hold a wakelock when USB is 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 |