diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 16:36:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 16:36:30 -0700 |
| commit | af76bbabbdf5cebea6a3863446f9f74b469c4bdc (patch) | |
| tree | 04f171157bd4c43a7fff841f310cb543ec31966c /drivers/watchdog/Makefile | |
| parent | 2024da603978882d102a34d47828a205fffb338e (diff) | |
| parent | 06063e26bc3ab62aa7aca874c6ce9e7638673838 (diff) | |
| download | talos-obmc-linux-af76bbabbdf5cebea6a3863446f9f74b469c4bdc.tar.gz talos-obmc-linux-af76bbabbdf5cebea6a3863446f9f74b469c4bdc.zip | |
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] Documentation/watchdog/src/watchdog-simple.c: improve this code
[WATCHDOG] AR7: watchdog timer
[WATCHDOG] Linux kernel IPC SBC Watchdog Timer driver
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 389f8b14ccc4..7d9e5734f8bb 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -90,6 +90,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o obj-$(CONFIG_INDYDOG) += indydog.o obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o +obj-$(CONFIG_AR7_WDT) += ar7_wdt.o # PARISC Architecture |
