diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-25 07:24:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-25 07:24:42 -0700 |
commit | c09c2d1089b55a3da7058a2f1a76c2f21c8b0688 (patch) | |
tree | 627fd280d884f289f3c646b8f9a1f940dbf8897b /drivers/watchdog/Kconfig | |
parent | 5c3cc2084dd9dc26b258f88abb629550090956e0 (diff) | |
parent | 38461c5c084ec9119f481f27629d84283733b82a (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:
[WATCHDOG] Add support for the Avionic Design Xanthos watchdog timer.
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r-- | drivers/watchdog/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index ff3eb8ff6bd..3711b888d48 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -282,6 +282,13 @@ config NUC900_WATCHDOG To compile this driver as a module, choose M here: the module will be called nuc900_wdt. +config ADX_WATCHDOG + tristate "Avionic Design Xanthos watchdog" + depends on ARCH_PXA_ADX + help + Say Y here if you want support for the watchdog timer on Avionic + Design Xanthos boards. + # AVR32 Architecture config AT32AP700X_WDT |