aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-17 10:46:54 +0100
committerMark Brown <broonie@linaro.org>2014-06-17 10:46:54 +0100
commit5997b6c787b91786620c65b768075ddc1fc44b20 (patch)
treed28c3bd724f06b613280a634f70a242c3cdc8ef8
parentfea9037ebedd7f0b0ef56239efe9857fcfed4e21 (diff)
parent43576434a7a9bc1654064f09ca806a9e00485dc0 (diff)
downloadlinux-5997b6c787b91786620c65b768075ddc1fc44b20.tar.gz
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
-rw-r--r--linaro/configs/vexpress64.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf
index d6a714657e2..c9b66a19858 100644
--- a/linaro/configs/vexpress64.conf
+++ b/linaro/configs/vexpress64.conf
@@ -52,3 +52,4 @@ CONFIG_GENERIC_CPUFREQ_CPU0=y
CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
CONFIG_ARM_DT_BL_CPUFREQ=y
CONFIG_ARM64_CPUIDLE=y
+CONFIG_ARM64_CRYPTO=y