diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-03 12:36:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-03 12:36:56 -0700 |
| commit | 7dfb1716d717e41c07410bab52760d865caee12b (patch) | |
| tree | d5e62713d8712af8c9b356ce402a4fa9526a6cae /drivers/char/watchdog/Makefile | |
| parent | 20c4856b1d1939647f71dce5e54fe69fde80013f (diff) | |
| parent | 4d389dcea8543161c3bb1e26f1c2ffb7e0822ff1 (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] clean-up watchdog documentation
[WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver
Diffstat (limited to 'drivers/char/watchdog/Makefile')
| -rw-r--r-- | drivers/char/watchdog/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile index 8bfc00cc7c2..d90f649038c 100644 --- a/drivers/char/watchdog/Makefile +++ b/drivers/char/watchdog/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_21285_WATCHDOG) += wdt285.o obj-$(CONFIG_977_WATCHDOG) += wdt977.o obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o +obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o |