aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-05-18 10:14:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-05-18 10:14:42 -0700
commit477e2c6f34a4c7c6dd9d796420979214c5b4ade7 (patch)
tree52c5f6d3cc2c447786e7650c8de0a155aef57fa5 /drivers
parentMerge tag 'usb-4.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff)
parentcpufreq: armada-37xx: driver relies on cpufreq-dt (diff)
downloadlinux-dev-477e2c6f34a4c7c6dd9d796420979214c5b4ade7.tar.xz
linux-dev-477e2c6f34a4c7c6dd9d796420979214c5b4ade7.zip
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/Kconfig.arm2
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
config ARM_ARMADA_37XX_CPUFREQ
tristate "Armada 37xx CPUFreq support"
- depends on ARCH_MVEBU
+ depends on ARCH_MVEBU && CPUFREQ_DT
help
This adds the CPUFreq driver support for Marvell Armada 37xx SoCs.
The Armada 37xx PMU supports 4 frequency and VDD levels.