7 files changed, 8 insertions, 8 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index e1b92788c225..cd4cccbfd2ab 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -299,7 +299,7 @@ config SATA_HIGHBANK
 
 config SATA_MV
         tristate "Marvell SATA support"
-        depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+        depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
                    ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
         select GENERIC_PHY
         help
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 18ad141907ff..28c666c80149 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -119,7 +119,7 @@ config ARM_INTEGRATOR
           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.
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.
 
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 8c96e2ddf43b..f6ef7bb2dc11 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -410,7 +410,7 @@ config LEDS_MC13783
 config LEDS_NS2
         tristate "LED support for Network Space v2 GPIO LEDs"
         depends on LEDS_CLASS
-        depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+        depends on MACH_KIRKWOOD
         default y
         help
           This option enable support for the dual-GPIO LED found on the
@@ -420,7 +420,7 @@ config LEDS_NS2
 config LEDS_NETXBIG
         tristate "LED support for Big Network series LEDs"
         depends on LEDS_CLASS
-        depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+        depends on MACH_KIRKWOOD
         default y
         help
           This option enable support for LEDs found on the LaCie 2Big
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index a168e96142b9..fae9464eed9c 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1198,7 +1198,7 @@ config RTC_DRV_TX4939
 
 config RTC_DRV_MV
         tristate "Marvell SoC RTC"
-        depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
+        depends on ARCH_DOVE || ARCH_MVEBU
         help
           If you say yes here you will get support for the in-chip RTC
           that can be found in some of Marvell's SoC devices, such as
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 693208eb9047..ef5587fe2c69 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -143,7 +143,7 @@ config RCAR_THERMAL
 
 config KIRKWOOD_THERMAL
         tristate "Temperature sensor on Marvell Kirkwood SoCs"
-        depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+        depends on MACH_KIRKWOOD
         depends on OF
         help
           Support for the Kirkwood thermal sensor driver into the Linux thermal
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index f57312fced80..1d1330a78af3 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -301,7 +301,7 @@ config DAVINCI_WATCHDOG
 
 config ORION_WATCHDOG
         tristate "Orion watchdog"
-        depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
+        depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
         select WATCHDOG_CORE
         help
           Say Y here if to include support for the watchdog timer