diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-20 22:49:06 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-20 22:49:06 +0900 |
| commit | 6a4f493c5d3f43d5c1998b4ae2eb1c9237c3420e (patch) | |
| tree | 76c311c1c8343733eb6290147f7d21d5b146eec0 /android/configs/android-recommended.cfg | |
| parent | 713330dd90243e893fbd677d18d2fb059e8719d4 (diff) | |
| parent | 7fc52650e4f815c1f382af3c51fbd569ebade2b2 (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-androidlinux-linaro-lsk-android-test
Diffstat (limited to 'android/configs/android-recommended.cfg')
| -rw-r--r-- | android/configs/android-recommended.cfg | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android/configs/android-recommended.cfg b/android/configs/android-recommended.cfg index 9caa089c5d1..aceee62a3e0 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 |