diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:01:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 13:01:11 -0700 |
| commit | 7f344f0aa7d4ec0e4c1c676329aff1353f90fb38 (patch) | |
| tree | 955347ebf22af5f7479ea9b01e8e8f14c2c426c0 /drivers/char/watchdog/Kconfig | |
| parent | 63589ed0785ffc715777a54ccb96cdfaea9edbc0 (diff) | |
| parent | 853807fb500a9442d88646b7be92bfa51334f8e8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] at91_wdt.c - Atmel AT91RM9200 watchdog driver
[WATCHDOG] pcwd_usb.c: fix a NULL pointer dereference
[WATCHDOG] pcwd.c sprintf/strcpy fix
[WATCHDOG] pcwd.c general clean-up after patches
[WATCHDOG] pcwd.c add debug info
[WATCHDOG] pcwd.c pcwd_cleanup_module patch
[WATCHDOG] pcwd.c firmware-info patch
[WATCHDOG] pcwd.c control status patch
Diffstat (limited to 'drivers/char/watchdog/Kconfig')
| -rw-r--r-- | drivers/char/watchdog/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig index 16e99db2e12..d53f664a4dd 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig @@ -60,6 +60,13 @@ config SOFT_WATCHDOG # ARM Architecture +config AT91_WATCHDOG + tristate "AT91RM9200 watchdog" + depends on WATCHDOG && ARCH_AT91RM9200 + help + Watchdog timer embedded into AT91RM9200 chips. This will reboot your + system when the timeout is reached. + config 21285_WATCHDOG tristate "DC21285 watchdog" depends on WATCHDOG && FOOTBRIDGE |