From da8a3700249608e24c3910549a5045cf1908a86d Mon Sep 17 00:00:00 2001 From: Rom Lemarchand Date: Tue, 28 Jan 2014 10:23:19 -0800 Subject: android: configs: update 3.10 options Change-Id: Ifbda55e570a22ace98d7d74b057ba21a597e0826 --- android/configs/android-base.cfg | 1 - android/configs/android-recommended.cfg | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'android') 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 9caa089c5d19..aceee62a3e0b 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_BLK_DEV_LOOP=y @@ -95,6 +94,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 -- cgit v1.2.3