aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-09-14 08:12:20 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-14 08:12:20 -0400
commit165415f700b0c77fa1f8db6198f48582639adf78 (patch)
tree088e305b0b5b0c6753072e13be1177824c3ed59d /drivers/char/watchdog/Makefile
parentc324b44c34050cf2a9b58830e11c974806bd85d8 (diff)
parent2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff)
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/char/watchdog/Makefile')
-rw-r--r--drivers/char/watchdog/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
index cfeac6f10137..bc6f5fe88c8c 100644
--- a/drivers/char/watchdog/Makefile
+++ b/drivers/char/watchdog/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
29obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o 29obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
30obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o 30obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
31obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o 31obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
32obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
32 33
33# X86 (i386 + ia64 + x86_64) Architecture 34# X86 (i386 + ia64 + x86_64) Architecture
34obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o 35obj-$(CONFIG_ACQUIRE_WDT) += acquirewdt.o