aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorAndrew Victor <linux@maxim.org.za>2008-11-05 22:36:35 +0200
committerWim Van Sebroeck <wim@iguana.be>2008-11-06 08:54:37 +0000
commitf0e625c1aa24e861c224fb778c377b2ddb443d2b (patch)
tree3f8d11576ac232052629b2707744da3f47e29f5b /drivers/watchdog
parentb954f6f63e7938a11de5bd15cb5cbcac7423cf97 (diff)
downloadkernel_samsung_aries-f0e625c1aa24e861c224fb778c377b2ddb443d2b.zip
kernel_samsung_aries-f0e625c1aa24e861c224fb778c377b2ddb443d2b.tar.gz
kernel_samsung_aries-f0e625c1aa24e861c224fb778c377b2ddb443d2b.tar.bz2
[WATCHDOG] SAM9 watchdog - supported on all SAM9 and CAP9 processors
The SAM9 watchdog driver is usable on the whole family of AT91SAM9 and CAP9 processors. Update the configuration to indicate this and allow the driver to be selected. Signed-off-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/Kconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 1a22fe7..4fd3fa5 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -67,11 +67,11 @@ config AT91RM9200_WATCHDOG
system when the timeout is reached.
config AT91SAM9X_WATCHDOG
- tristate "AT91SAM9X watchdog"
- depends on WATCHDOG && (ARCH_AT91SAM9260 || ARCH_AT91SAM9261)
+ tristate "AT91SAM9X / AT91CAP9 watchdog"
+ depends on ARCH_AT91 && !ARCH_AT91RM9200
help
- Watchdog timer embedded into AT91SAM9X chips. This will reboot your
- system when the timeout is reached.
+ Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
+ reboot your system when the timeout is reached.
config 21285_WATCHDOG
tristate "DC21285 watchdog"