aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-11-16 11:29:09 +0800
committerAlex Shi <alex.shi@linaro.org>2015-11-16 11:29:09 +0800
commitfd2b464fb80185a8defba0e41e130b63beabe467 (patch)
tree5e33017671893fa61c44d4b324e1ea42b2eb6c01
parent29ed9e09b5173c3bbc9999c1ecebd9823c09857c (diff)
parent601f77fddf37d5286535497c55f776fc70770510 (diff)
Merge remote-tracking branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18lsk-v3.18-15.11
-rw-r--r--linaro/configs/vexpress64.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf
index cb5d0162c0fa..a3bb8d432ccc 100644
--- a/linaro/configs/vexpress64.conf
+++ b/linaro/configs/vexpress64.conf
@@ -54,3 +54,5 @@ CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
CONFIG_ARM_DT_BL_CPUFREQ=y
CONFIG_ARM64_CPUIDLE=y
CONFIG_ARM64_CRYPTO=y
+CONFIG_SATA_SIL24=y
+CONFIG_SKY2=y