aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-11-20 11:40:36 -0800
committerKevin Hilman <khilman@linaro.org>2015-11-20 11:40:36 -0800
commitb4ac03693e33029871eb54e0913e458894109485 (patch)
tree8360d084e9db2e2812b192b043e19f5801373d16
parent48946c60a33d2fe10207f2b951ebb9a5708b0268 (diff)
parent10160fc3bf6c14e2ee647a823aac5ee6963907e4 (diff)
Merge branch 'linaro/3.18/eas_20151120' of git://linux-arm.org/linux-jl into linux-linaro-lsk-v3.18-eas-testlinux-linaro-lsk-v3.18-eas-test
-rw-r--r--drivers/cpufreq/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 8d4e08aa4c31..f57b114ad9fe 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -193,7 +193,7 @@ config CPU_FREQ_GOV_CONSERVATIVE
If in doubt, say N.
config CPU_FREQ_GOV_SCHED
- tristate "'sched' cpufreq governor"
+ bool "'sched' cpufreq governor"
depends on CPU_FREQ
select CPU_FREQ_GOV_COMMON
help