aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-17 20:54:00 +0000
committerMark Brown <broonie@linaro.org>2013-12-17 20:54:00 +0000
commit3c4386c8ffe1400832060ee9c69c96452b1c4ddb (patch)
tree64d13188e37c66e63137c674adb992454789756f
parentd1eda188a3516b60071afcfec6c8b4d2a8269bbb (diff)
parent9d2405afbc7bc9e8ac7f365242835a7fb2995a5c (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
-rw-r--r--linaro/configs/android.conf1
-rw-r--r--linaro/configs/vexpress64.conf1
2 files changed, 2 insertions, 0 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index bb90ecd9e16..538adefff80 100644
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -29,3 +29,4 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
CONFIG_FUSE_FS=y
CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
+CONFIG_ION=y
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf
index 7895612e1ed..eecc6d564ad 100644
--- a/linaro/configs/vexpress64.conf
+++ b/linaro/configs/vexpress64.conf
@@ -1,5 +1,6 @@
CONFIG_ARCH_VEXPRESS=y
CONFIG_SMP=y
+CONFIG_NR_CPUS=8
CONFIG_CMDLINE="console=ttyAMA0"
CONFIG_COMPAT=y
CONFIG_SMC91X=y