diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-18 13:14:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-18 13:14:42 -0400 |
| commit | 477e2c6f34a4c7c6dd9d796420979214c5b4ade7 (patch) | |
| tree | 52c5f6d3cc2c447786e7650c8de0a155aef57fa5 | |
| parent | 0e273f9edcea9b6893aed90b4ccf8b400dd838ea (diff) | |
| parent | 0cf442c6bcf572e04f5690340d5b8e62afcee2ca (diff) | |
Merge tag 'pm-4.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Fix Kconfig dependencies of the armada-37xx cpufreq driver (Miquel
Raynal)"
* tag 'pm-4.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
cpufreq: armada-37xx: driver relies on cpufreq-dt
| -rw-r--r-- | drivers/cpufreq/Kconfig.arm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index de55c7d57438..96b35b8b3606 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm | |||
| @@ -20,7 +20,7 @@ config ACPI_CPPC_CPUFREQ | |||
| 20 | 20 | ||
| 21 | config ARM_ARMADA_37XX_CPUFREQ | 21 | config ARM_ARMADA_37XX_CPUFREQ |
| 22 | tristate "Armada 37xx CPUFreq support" | 22 | tristate "Armada 37xx CPUFreq support" |
| 23 | depends on ARCH_MVEBU | 23 | depends on ARCH_MVEBU && CPUFREQ_DT |
| 24 | help | 24 | help |
| 25 | This adds the CPUFreq driver support for Marvell Armada 37xx SoCs. | 25 | This adds the CPUFreq driver support for Marvell Armada 37xx SoCs. |
| 26 | The Armada 37xx PMU supports 4 frequency and VDD levels. | 26 | The Armada 37xx PMU supports 4 frequency and VDD levels. |