diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:49:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:49:55 -0400 |
| commit | 24665cd00dd06c741ef6268515ca9e6d3cda5c57 (patch) | |
| tree | d55e925db2b78bc6529965fa6b1df07a76b56610 /drivers/char/watchdog/Makefile | |
| parent | fed2fc18a4567d613cd35115322257c6c6c710e9 (diff) | |
| parent | d7152fe14cad075d6dd4ee4194acd131aed0244e (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/paulus/ppc64-2.6
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 1cd27efa35c1..c1838834ea7f 100644 --- a/drivers/char/watchdog/Makefile +++ b/drivers/char/watchdog/Makefile | |||
| @@ -33,6 +33,7 @@ obj-$(CONFIG_USBPCWATCHDOG) += pcwd_usb.o | |||
| 33 | obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o | 33 | obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o |
| 34 | obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o | 34 | obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o |
| 35 | obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o | 35 | obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o |
| 36 | obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o | ||
| 36 | 37 | ||
| 37 | # Only one watchdog can succeed. We probe the hardware watchdog | 38 | # Only one watchdog can succeed. We probe the hardware watchdog |
| 38 | # drivers first, then the softdog driver. This means if your hardware | 39 | # drivers first, then the softdog driver. This means if your hardware |