git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
watchdog
/
Makefile
diff --git
a/drivers/watchdog/Makefile
b/drivers/watchdog/Makefile
index 5e3cb95bb0e9cc58c653eb632cd2a990eb1ea486..72f3e2073f8e4e468f9bb720a313cbf3509bb9ce 100644
(file)
--- a/
drivers/watchdog/Makefile
+++ b/
drivers/watchdog/Makefile
@@
-47,6
+47,7
@@
obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o
obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
+obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o