diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 07:18:59 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 07:18:59 -0400 |
commit | 7a4b35082c0f6997cb32b67a9cde169ec8e64706 (patch) | |
tree | c3fb875143d9c7862c2051bcd3447e26e354fdde /drivers/cpufreq | |
parent | defa4c738aa90e29e91eff43b0c1b3198367ce9c (diff) | |
parent | ea61623fe9badd5a195b3a0878e6d89a2f97ac0e (diff) |
Merge branch 'cpufreq-next' of git://git.linaro.org/people/vireshk/linux into pm-cpufreq
ARM cpufreq updates from Viresh Kumar.
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/Kconfig.arm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 6e57543fe0b9..5c7c2e1645b4 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm | |||
@@ -5,6 +5,7 @@ | |||
5 | config ARM_BIG_LITTLE_CPUFREQ | 5 | config ARM_BIG_LITTLE_CPUFREQ |
6 | tristate "Generic ARM big LITTLE CPUfreq driver" | 6 | tristate "Generic ARM big LITTLE CPUfreq driver" |
7 | depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK | 7 | depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK |
8 | select CPU_FREQ_TABLE | ||
8 | help | 9 | help |
9 | This enables the Generic CPUfreq driver for ARM big.LITTLE platforms. | 10 | This enables the Generic CPUfreq driver for ARM big.LITTLE platforms. |
10 | 11 | ||
@@ -86,6 +87,7 @@ config ARM_INTEGRATOR | |||
86 | 87 | ||
87 | config ARM_KIRKWOOD_CPUFREQ | 88 | config ARM_KIRKWOOD_CPUFREQ |
88 | def_bool ARCH_KIRKWOOD && OF | 89 | def_bool ARCH_KIRKWOOD && OF |
90 | select CPU_FREQ_TABLE | ||
89 | help | 91 | help |
90 | This adds the CPUFreq driver for Marvell Kirkwood | 92 | This adds the CPUFreq driver for Marvell Kirkwood |
91 | SoCs. | 93 | SoCs. |
@@ -147,6 +149,7 @@ config ARM_SA1110_CPUFREQ | |||
147 | config ARM_SPEAR_CPUFREQ | 149 | config ARM_SPEAR_CPUFREQ |
148 | bool "SPEAr CPUFreq support" | 150 | bool "SPEAr CPUFreq support" |
149 | depends on PLAT_SPEAR | 151 | depends on PLAT_SPEAR |
152 | select CPU_FREQ_TABLE | ||
150 | default y | 153 | default y |
151 | help | 154 | help |
152 | This adds the CPUFreq driver support for SPEAr SOCs. | 155 | This adds the CPUFreq driver support for SPEAr SOCs. |