projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
Makefile
diff --git
a/drivers/watchdog/Makefile
b/drivers/watchdog/Makefile
index 985a66cda76f23ac89932672f1f813c9cab2dade..1b5f3d5efad5bb20e8f64c9b24b24e61a8d0bd23 100644
(file)
--- a/
drivers/watchdog/Makefile
+++ b/
drivers/watchdog/Makefile
@@
-58,6
+58,7
@@
obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o
obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o
obj-$(CONFIG_SIRFSOC_WATCHDOG) += sirfsoc_wdt.o
obj-$(CONFIG_BCM_KONA_WDT) += bcm_kona_wdt.o
+obj-$(CONFIG_TEGRA_WATCHDOG) += tegra_wdt.o
# AVR32 Architecture
obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o