diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-04-03 15:36:34 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-04-11 19:21:27 -0700 |
| commit | 791057d09a8217e2825538192ae1acddf8f479bb (patch) | |
| tree | 74d2d916537957da4f6cd7866fdfd395a2cdeb59 | |
| parent | ef45a8be9eb5a79ac26b369d280044a973f3102a (diff) | |
| download | linux-topics-791057d09a8217e2825538192ae1acddf8f479bb.tar.gz | |
config: Fixes for bug 97769869 suggested by Tixy
Add changes requested by Tixy to handle bug 97769869. Rebalanced
common items out of android.conf and ubuntu.conf into linaro-base.conf
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | configs/android.conf | 4 | ||||
| -rw-r--r-- | configs/linaro-base.conf | 2 | ||||
| -rw-r--r-- | configs/ubuntu.conf | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/configs/android.conf b/configs/android.conf index 18f18d9d733..ae7aca8f87d 100644 --- a/configs/android.conf +++ b/configs/android.conf @@ -2,6 +2,8 @@ CONFIG_PANIC_TIMEOUT=0 CONFIG_HAS_WAKELOCK=y CONFIG_WAKELOCK=y CONFIG_USER_WAKELOCK=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_DM_CRYPT=y CONFIG_ANDROID_PARANOID_NETWORK=y CONFIG_NET_ACTIVITY_STATS=y CONFIG_INPUT_GPIO=y @@ -17,4 +19,4 @@ CONFIG_ANDROID_TIMED_OUTPUT=y CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ANDROID_INTF_ALARM_DEV=y - +CONFIG_CRYPTO_TWOFISH=y diff --git a/configs/linaro-base.conf b/configs/linaro-base.conf index d397541aec9..cc095287320 100644 --- a/configs/linaro-base.conf +++ b/configs/linaro-base.conf @@ -20,6 +20,8 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_IDLE=y CONFIG_BINFMT_MISC=y +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y diff --git a/configs/ubuntu.conf b/configs/ubuntu.conf index 25bb2443f4b..b8c74b8c750 100644 --- a/configs/ubuntu.conf +++ b/configs/ubuntu.conf @@ -11,8 +11,6 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=65536 -CONFIG_MD=y -CONFIG_BLK_DEV_DM=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y # CONFIG_DEVKMEM is not set |