diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-27 17:25:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-27 17:25:03 +0100 |
| commit | 74d3aa5b4835831233251c99715e8e12aa9b0c1f (patch) | |
| tree | 96b8a88827343ebc14e8ad74a25699b908091576 /drivers | |
| parent | 8352d7dd08ad3a89db6c65286d2b3567ba417879 (diff) | |
| parent | 3e692693dbc02420fd5bea45a51070121446ace6 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-bl-cpufreq' into linux-linaro-lsk
Conflicts:
arch/arm64/Kconfig
drivers/cpufreq/Kconfig.arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/Kconfig.arm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 8327444b76cb..22727792350b 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -4,7 +4,8 @@ config ARM_BIG_LITTLE_CPUFREQ tristate "Generic ARM big LITTLE CPUfreq driver" - depends on ARM_CPU_TOPOLOGY && PM_OPP && HAVE_CLK && BIG_LITTLE + depends on (ARM_CPU_TOPOLOGY && BIG_LITTLE) || (ARM64 && SMP) + depends on PM_OPP && HAVE_CLK help This enables the Generic CPUfreq driver for ARM big.LITTLE platforms. |