diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 15:28:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-17 15:28:18 -0700 |
| commit | 99e1221d1a1edac316f7f8116c781f75733b1159 (patch) | |
| tree | 43eb69bf65de33b2a4d6e506e6bc95c14906bed7 /drivers/char/watchdog/Kconfig | |
| parent | f3d9071667752e5d419e59f76912ed3fb4a6bb9c (diff) | |
| parent | 7e2a1498a90aff0e57271bf838a29aaa4e1c6bf9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (21 commits)
[WATCHDOG] at32ap700x_wdt.c - Fix compilation warnings
[WATCHDOG] at32ap700x_wdt.c - Add spinlock support
[WATCHDOG] at32ap700x_wdt.c - Add nowayout + MAGICCLOSE features
[WATCHDOG] at32ap700x_wdt.c - timeout module parameter patch
[WATCHDOG] at32ap700x_wdt.c - checkpatch.pl-0.05 clean-up's
[WATCHDOG] change s3c2410_wdt to using dev_() macros for output
[WATCHDOG] s3c2410_wdt announce initialisation
[WATCHDOG] at32ap700x-wdt: add iounmap if probe function fails
[WATCHDOG] at32ap700x-wdt: add missing iounmap in _remove
[WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix-2
[WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix
[WATCHDOG] Watchdog driver for AT32AP700X devices
[WATCHDOG] Mixcom Watchdog - CodingStyle clean-up
[WATCHDOG] Mixcom Watchdog - clean-up printk's
[WATCHDOG] Mixcom Watchdog - clean-up printk's
[WATCHDOG] Mixcom Watchdog - checkcard part 2
[WATCHDOG] Mixcom Watchdog - checkcard
[WATCHDOG] Mixcom Watchdog - get rid of port offset's
[WATCHDOG] Mixcom Watchdog - update "Documentation"
[WATCHDOG] Remove the redundant check for pwrite() in EP93XXX watchdog.
...
Diffstat (limited to 'drivers/char/watchdog/Kconfig')
| -rw-r--r-- | drivers/char/watchdog/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig index 53f5538c0c0..2f48ba32996 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig @@ -187,6 +187,15 @@ config PNX4008_WATCHDOG Say N if you are unsure. +# AVR32 Architecture + +config AT32AP700X_WDT + tristate "AT32AP700x watchdog" + depends on WATCHDOG && CPU_AT32AP7000 + help + Watchdog timer embedded into AT32AP700x devices. This will reboot + your system when the timeout is reached. + # X86 (i386 + ia64 + x86_64) Architecture config ACQUIRE_WDT |