Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk

diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index bb90ecd9e16273ebbc948d72d4d79cc77fa54559..538adefff80f44a2a24fcf60acbc497495d2ba16 100644 (file)
--- 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 7895612e1ed3ffc7acd14bdf7af4245c3825fb92..eecc6d564ad66b81875f18926d873529e207f209 100644 (file)
--- 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