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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | drivers/watchdog/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 348b3b862c9..699199b1baa 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -45,6 +45,7 @@ obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o obj-$(CONFIG_COH901327_WATCHDOG) += coh901327_wdt.o obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o +obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o # AVR32 Architecture obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o |