diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-24 09:29:09 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-24 09:29:09 +0400 |
| commit | 422d9abf99f12de5eb5fbc0f5bce87ff1066f941 (patch) | |
| tree | 54104d472fddc72f0f0f43a4afac5d2c9036b400 /drivers/cpuidle | |
| parent | 2fee8c1dd07260329e9788984b79b099456a9d11 (diff) | |
| parent | ace8578182dc347b043c0825b9873f62fdaa5b77 (diff) | |
| download | linux-422d9abf99f12de5eb5fbc0f5bce87ff1066f941.tar.xz | |
Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
Merge "mvebu fixes for v3.17" from Jason Cooper:
- kirkwood
- final driver cleanup of ARCH_KIRKWOOD removal
- fix DT based DSA
- mvebu
- use BCH ECC for the RN2120 and RN104/2 nand chips
* tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Netgear RN102: Use Hardware BCH ECC
ARM: Kirkwood: Fix DT based DSA.
ARM: mvebu: Netgear RN2120: Use Hardware BCH ECC
ARM: mvebu: Netgear RN104: Use Hardware BCH ECC
cpufreq: Remove ARCH_KIRKWOOD dependency
watchdog: Remove ARCH_KIRKWOOD dependency
rtc: Remove ARCH_KIRKWOOD dependency
leds: Remove ARCH_KIRKWOOD dependency
thermal: Remove ARCH_KIRKWOOD dependency
ata: Remove ARCH_KIRKWOOD dependency
cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
Diffstat (limited to 'drivers/cpuidle')
| -rw-r--r-- | drivers/cpuidle/Kconfig.arm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 38cff69ffe06..58bcd0d166ec 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -28,7 +28,7 @@ config ARM_HIGHBANK_CPUIDLE config ARM_KIRKWOOD_CPUIDLE bool "CPU Idle Driver for Marvell Kirkwood SoCs" - depends on ARCH_KIRKWOOD || MACH_KIRKWOOD + depends on MACH_KIRKWOOD help This adds the CPU Idle driver for Marvell Kirkwood SoCs. |