diff options
| author | Rom Lemarchand <romlem@android.com> | 2014-01-28 10:23:19 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-02-16 13:54:30 -0800 |
| commit | 9f686c1724a54bab4b89af3bc7ae3a47b30ac890 (patch) | |
| tree | 3707f035cd6d413f9d82a72858e4b4c835c0de07 /android | |
| parent | 24a23bde71378d0ea9c8b5eb9d8175dea5d951df (diff) | |
android: configs: update 3.10 options
Change-Id: Ifbda55e570a22ace98d7d74b057ba21a597e0826
Diffstat (limited to 'android')
| -rw-r--r-- | android/configs/android-base.cfg | 1 | ||||
| -rw-r--r-- | android/configs/android-recommended.cfg | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg index 6b67601b7f1a..00c99e1f3b1f 100644 --- a/android/configs/android-base.cfg +++ b/android/configs/android-base.cfg @@ -17,7 +17,6 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_SCHED=y CONFIG_DM_CRYPT=y CONFIG_EMBEDDED=y -CONFIG_EXPERIMENTAL=y CONFIG_FB=y CONFIG_HIGH_RES_TIMERS=y CONFIG_INET6_AH=y diff --git a/android/configs/android-recommended.cfg b/android/configs/android-recommended.cfg index e95f09c0dffe..8079073e6fae 100644 --- a/android/configs/android-recommended.cfg +++ b/android/configs/android-recommended.cfg @@ -5,7 +5,6 @@ # CONFIG_NF_CONNTRACK_SIP is not set # CONFIG_PM_WAKELOCKS_GC is not set # CONFIG_VT is not set -CONFIG_ANDROID_RAM_CONSOLE=y CONFIG_ANDROID_TIMED_GPIO=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BATTERY_ANDROID=y @@ -96,6 +95,9 @@ CONFIG_PM_DEBUG=y CONFIG_PM_RUNTIME=y CONFIG_PM_WAKELOCKS_LIMIT=0 CONFIG_POWER_SUPPLY=y +CONFIG_PSTORE=y +CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_RAM=y CONFIG_SCHEDSTATS=y CONFIG_SMARTJOYPLUS_FF=y CONFIG_SND=y |