]> git.baikalelectronics.ru Git - kernel.git/commitdiff
cpufreq: kirkwood: Reinstate cpufreq driver for ARCH_KIRKWOOD
authorQuentin Armitage <quentin@armitage.org.uk>
Thu, 10 Jul 2014 10:15:55 +0000 (11:15 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 16 Jul 2014 13:12:03 +0000 (15:12 +0200)
Commit 0e34ede74f5eeb27729ffca3ff8427b236927d1e ("drivers: Enable
building of Kirkwood drivers for mach-mvebu") added Kirkwood into
mach-mvebu, adding MACH_KIRKWOOD to ARCH_KIRKWOOD in the KConfig files.

The change for ARM_KIRKWOOD_CPUFREQ replaced ARCH_KIRKWOOD with
MACH_KIRKWOOD, whereas all the other changes were ARCH_KIRKWOOD ||
MACH_KIRKWOOD.

As a consequence of this change, the cpufreq driver is no longer enabled
for ARCH_KIRKWOOD. This patch reinstates ARM_KIRKWOOD_CPUFREQ for
ARCH_KIRKWOOD.

Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpufreq/Kconfig.arm

index 8c5cf4bdeab8f74b37ec96d9a8ac0c09f290049e..7364a538e0562a82b855c95305f983d8a63eb2be 100644 (file)
@@ -119,7 +119,7 @@ config ARM_INTEGRATOR
          If in doubt, say Y.
 
 config ARM_KIRKWOOD_CPUFREQ
-       def_bool MACH_KIRKWOOD
+       def_bool ARCH_KIRKWOOD || MACH_KIRKWOOD
        help
          This adds the CPUFreq driver for Marvell Kirkwood
          SoCs.