Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes...

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

diff --combined drivers/cpufreq/Kconfig.arm
index 18ad141,8c5cf4b..28c666c
--- 1/drivers/cpufreq/Kconfig.arm
--- 2/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@@ -77,7 -77,7 +77,7 @@@ config ARM_EXYNOS5440_CPUFRE
  
  config ARM_EXYNOS_CPU_FREQ_BOOST_SW
        bool "EXYNOS Frequency Overclocking - Software"
 -      depends on ARM_EXYNOS_CPUFREQ
 +      depends on ARM_EXYNOS_CPUFREQ && THERMAL
        select CPU_FREQ_BOOST_SW
        select EXYNOS_THERMAL
        help
@@@ -119,7 -119,7 +119,7 @@@ config ARM_INTEGRATO
          If in doubt, say Y.
  
  config ARM_KIRKWOOD_CPUFREQ
-       def_bool ARCH_KIRKWOOD || MACH_KIRKWOOD
+       def_bool MACH_KIRKWOOD
        help
          This adds the CPUFreq driver for Marvell Kirkwood
          SoCs.