ARM: at91/Kconfig: remove ARCH_AT91RM9200 option for drivers

The precise selection is useless, so we simply remove these dependencies.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Boris BREZILLON <boris.brezillon@free-electrons.com>

diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig
index 9e089d24466e65fb6c8b01c08f2ece882e23aaaa..3564fe9d3f69bab9e5a8536fe551e0b345591121 100644 (file)
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@ -22,7 +22,7 @@ if NET_CADENCE
 
 config ARM_AT91_ETHER
        tristate "AT91RM9200 Ethernet support"
-       depends on HAS_DMA && (ARCH_AT91RM9200 || COMPILE_TEST)
+       depends on HAS_DMA && (ARCH_AT91 || COMPILE_TEST)
        select MACB
        ---help---
          If you wish to compile a kernel for the AT91RM9200 and enable

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index aa96e375915d3a003c0e3facdfd27a7b4444edc4..0b704889bf9172b62c122e62e970290fbc35f7a4 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1110,7 +1110,7 @@ config RTC_DRV_AT91RM9200
 
 config RTC_DRV_AT91SAM9
        tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
-       depends on ARCH_AT91 && !ARCH_AT91RM9200
+       depends on ARCH_AT91
        help
          RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
          (Real Time Timer). These timers are powered by the backup power

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d0107d424ee47feeb7cd16ff6b430462215b0db2..08f41add146134db9c6975f277b998dee77c70f3 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -154,14 +154,14 @@ config ARM_SP805_WATCHDOG
 
 config AT91RM9200_WATCHDOG
        tristate "AT91RM9200 watchdog"
-       depends on ARCH_AT91RM9200
+       depends on SOC_AT91RM9200
        help
          Watchdog timer embedded into AT91RM9200 chips. This will reboot your
          system when the timeout is reached.
 
 config AT91SAM9X_WATCHDOG
        tristate "AT91SAM9X / AT91CAP9 watchdog"
-       depends on ARCH_AT91 && !ARCH_AT91RM9200
+       depends on ARCH_AT91
        select WATCHDOG_CORE
        help
          Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will