diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-11-21 10:34:08 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-11-26 10:42:05 -0500 |
commit | ee72f18b3465c4d159a49413f3c614c21be25cbe (patch) | |
tree | 095380f9c7c084082e2c3e56042f2d091ab58c79 | |
parent | e152015b27e5ae2dbff0773942924b3eb71bdb74 (diff) |
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>
-rw-r--r-- | drivers/net/ethernet/cadence/Kconfig | 2 | ||||
-rw-r--r-- | drivers/rtc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/watchdog/Kconfig | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig index 9e089d24466e..3564fe9d3f69 100644 --- a/drivers/net/ethernet/cadence/Kconfig +++ b/drivers/net/ethernet/cadence/Kconfig | |||
@@ -22,7 +22,7 @@ if NET_CADENCE | |||
22 | 22 | ||
23 | config ARM_AT91_ETHER | 23 | config ARM_AT91_ETHER |
24 | tristate "AT91RM9200 Ethernet support" | 24 | tristate "AT91RM9200 Ethernet support" |
25 | depends on HAS_DMA && (ARCH_AT91RM9200 || COMPILE_TEST) | 25 | depends on HAS_DMA && (ARCH_AT91 || COMPILE_TEST) |
26 | select MACB | 26 | select MACB |
27 | ---help--- | 27 | ---help--- |
28 | If you wish to compile a kernel for the AT91RM9200 and enable | 28 | If you wish to compile a kernel for the AT91RM9200 and enable |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index aa96e375915d..0b704889bf91 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -1110,7 +1110,7 @@ config RTC_DRV_AT91RM9200 | |||
1110 | 1110 | ||
1111 | config RTC_DRV_AT91SAM9 | 1111 | config RTC_DRV_AT91SAM9 |
1112 | tristate "AT91SAM9x/AT91CAP9 RTT as RTC" | 1112 | tristate "AT91SAM9x/AT91CAP9 RTT as RTC" |
1113 | depends on ARCH_AT91 && !ARCH_AT91RM9200 | 1113 | depends on ARCH_AT91 |
1114 | help | 1114 | help |
1115 | RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT | 1115 | RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT |
1116 | (Real Time Timer). These timers are powered by the backup power | 1116 | (Real Time Timer). These timers are powered by the backup power |
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index d0107d424ee4..08f41add1461 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -154,14 +154,14 @@ config ARM_SP805_WATCHDOG | |||
154 | 154 | ||
155 | config AT91RM9200_WATCHDOG | 155 | config AT91RM9200_WATCHDOG |
156 | tristate "AT91RM9200 watchdog" | 156 | tristate "AT91RM9200 watchdog" |
157 | depends on ARCH_AT91RM9200 | 157 | depends on SOC_AT91RM9200 |
158 | help | 158 | help |
159 | Watchdog timer embedded into AT91RM9200 chips. This will reboot your | 159 | Watchdog timer embedded into AT91RM9200 chips. This will reboot your |
160 | system when the timeout is reached. | 160 | system when the timeout is reached. |
161 | 161 | ||
162 | config AT91SAM9X_WATCHDOG | 162 | config AT91SAM9X_WATCHDOG |
163 | tristate "AT91SAM9X / AT91CAP9 watchdog" | 163 | tristate "AT91SAM9X / AT91CAP9 watchdog" |
164 | depends on ARCH_AT91 && !ARCH_AT91RM9200 | 164 | depends on ARCH_AT91 |
165 | select WATCHDOG_CORE | 165 | select WATCHDOG_CORE |
166 | help | 166 | help |
167 | Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will | 167 | Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will |