aboutsummaryrefslogtreecommitdiff
path: root/linaro
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-18 18:45:52 +0100
committerMark Brown <broonie@linaro.org>2014-05-18 18:45:52 +0100
commit887191f9ae57f7adb3b4540a096f90f358d8e339 (patch)
treecf1c2749ffabd713c591b78534ae39a51f59ff88 /linaro
parent878a2cbd66c54d3f8b278df48f1c401e58507a2f (diff)
parentf15a6a129d6bee7e6a756eaaf6eddf7ed672eaba (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/configs' into linux-linaro-lsk
Diffstat (limited to 'linaro')
-rw-r--r--linaro/configs/preempt-rt.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/linaro/configs/preempt-rt.conf b/linaro/configs/preempt-rt.conf
index f8873a6dfb32..98e036d75442 100644
--- a/linaro/configs/preempt-rt.conf
+++ b/linaro/configs/preempt-rt.conf
@@ -1,4 +1,4 @@
CONFIG_PREEMPT=y
CONFIG_PREEMPT_RT_FULL=y
CONFIG_SLUB=y
-CONFIG_CPU_FREQ=n
+# CONFIG_CPU_FREQ is not set