summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@linaro.org>2015-02-02 14:59:38 -0800
committerMichael Turquette <mturquette@linaro.org>2015-02-02 14:59:38 -0800
commit54eea32f7ed3037c91853924227585b65df909a8 (patch)
tree4e3e9ece8a66f611e980ddc503ca7184db8f83fb /drivers/cpufreq
parente36f014edff70fc02b3d3d79cead1d58f289332e (diff)
parentb530e7d2108a871279dcf707d9d15a3358767d2b (diff)
downloadlinux-stable-54eea32f7ed3037c91853924227585b65df909a8.tar.gz
linux-stable-54eea32f7ed3037c91853924227585b65df909a8.tar.bz2
linux-stable-54eea32f7ed3037c91853924227585b65df909a8.zip
Merge branch 'clk-next' into v3.19-rc7
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/Kconfig.powerpc2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/Kconfig.powerpc b/drivers/cpufreq/Kconfig.powerpc
index 72564b701b4a..7ea24413cee6 100644
--- a/drivers/cpufreq/Kconfig.powerpc
+++ b/drivers/cpufreq/Kconfig.powerpc
@@ -26,7 +26,7 @@ config CPU_FREQ_MAPLE
config PPC_CORENET_CPUFREQ
tristate "CPU frequency scaling driver for Freescale E500MC SoCs"
depends on PPC_E500MC && OF && COMMON_CLK
- select CLK_PPC_CORENET
+ select CLK_QORIQ
help
This adds the CPUFreq driver support for Freescale e500mc,
e5500 and e6500 series SoCs which are capable of changing