diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-17 20:54:30 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-17 20:54:30 +0000 |
| commit | e53e72abbcf2162716a5eaaa2fa94cbbd6519132 (patch) | |
| tree | 82b332773341b03e6ebaa2678532edf29a28e865 | |
| parent | 425f051d39fbd5c23c1b7cc2293e9d403c00022e (diff) | |
| parent | 3c4386c8ffe1400832060ee9c69c96452b1c4ddb (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
| -rw-r--r-- | linaro/configs/android.conf | 1 | ||||
| -rw-r--r-- | linaro/configs/vexpress64.conf | 1 |
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 |