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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | drivers/char/watchdog/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile index d90f649038c..3907ec04a4e 100644 --- a/drivers/char/watchdog/Makefile +++ b/drivers/char/watchdog/Makefile @@ -36,6 +36,9 @@ obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o +# AVR32 Architecture +obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o + # X86 (i386 + ia64 + x86_64) Architecture obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o obj-$(CONFIG_ADVANTECH_WDT) += advantechwdt.o |