Commit 477e2c6f authored by Linus Torvalds's avatar Linus Torvalds

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
parents 0e273f9e 0cf442c6
...@@ -20,7 +20,7 @@ config ACPI_CPPC_CPUFREQ ...@@ -20,7 +20,7 @@ config ACPI_CPPC_CPUFREQ
config ARM_ARMADA_37XX_CPUFREQ config ARM_ARMADA_37XX_CPUFREQ
tristate "Armada 37xx CPUFreq support" tristate "Armada 37xx CPUFreq support"
depends on ARCH_MVEBU depends on ARCH_MVEBU && CPUFREQ_DT
help help
This adds the CPUFreq driver support for Marvell Armada 37xx SoCs. This adds the CPUFreq driver support for Marvell Armada 37xx SoCs.
The Armada 37xx PMU supports 4 frequency and VDD levels. The Armada 37xx PMU supports 4 frequency and VDD levels.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment