Przeglądaj źródła

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>
Nicolas Ferre 10 lat temu
rodzic
commit
ee72f18b34

+ 1 - 1
drivers/net/ethernet/cadence/Kconfig

@@ -22,7 +22,7 @@ if NET_CADENCE
 
 
 config ARM_AT91_ETHER
 config ARM_AT91_ETHER
 	tristate "AT91RM9200 Ethernet support"
 	tristate "AT91RM9200 Ethernet support"
-	depends on HAS_DMA && (ARCH_AT91RM9200 || COMPILE_TEST)
+	depends on HAS_DMA && (ARCH_AT91 || COMPILE_TEST)
 	select MACB
 	select MACB
 	---help---
 	---help---
 	  If you wish to compile a kernel for the AT91RM9200 and enable
 	  If you wish to compile a kernel for the AT91RM9200 and enable

+ 1 - 1
drivers/rtc/Kconfig

@@ -1110,7 +1110,7 @@ config RTC_DRV_AT91RM9200
 
 
 config RTC_DRV_AT91SAM9
 config RTC_DRV_AT91SAM9
 	tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
 	tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
-	depends on ARCH_AT91 && !ARCH_AT91RM9200
+	depends on ARCH_AT91
 	help
 	help
 	  RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
 	  RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
 	  (Real Time Timer). These timers are powered by the backup power
 	  (Real Time Timer). These timers are powered by the backup power

+ 2 - 2
drivers/watchdog/Kconfig

@@ -154,14 +154,14 @@ config ARM_SP805_WATCHDOG
 
 
 config AT91RM9200_WATCHDOG
 config AT91RM9200_WATCHDOG
 	tristate "AT91RM9200 watchdog"
 	tristate "AT91RM9200 watchdog"
-	depends on ARCH_AT91RM9200
+	depends on SOC_AT91RM9200
 	help
 	help
 	  Watchdog timer embedded into AT91RM9200 chips. This will reboot your
 	  Watchdog timer embedded into AT91RM9200 chips. This will reboot your
 	  system when the timeout is reached.
 	  system when the timeout is reached.
 
 
 config AT91SAM9X_WATCHDOG
 config AT91SAM9X_WATCHDOG
 	tristate "AT91SAM9X / AT91CAP9 watchdog"
 	tristate "AT91SAM9X / AT91CAP9 watchdog"
-	depends on ARCH_AT91 && !ARCH_AT91RM9200
+	depends on ARCH_AT91
 	select WATCHDOG_CORE
 	select WATCHDOG_CORE
 	help
 	help
 	  Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
 	  Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will