summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-01 16:51:19 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-01 16:51:19 -0800
commitd74e026ae5c4d4289c2ca0a9c404eed4f4bb235e (patch)
treea718106dac2c21534cf1faa039dadfc8695b58fa /drivers/watchdog/Makefile
parent449a97d07a8d4ed4e8e3981ce6ae42c25e381b24 (diff)
parent7c0ae5be821c1b6a700c5506de9b62e95f60df3c (diff)
downloadlinux-d74e026ae5c4d4289c2ca0a9c404eed4f4bb235e.tar.bz2
Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing
Kees writes: Become maintainer, add hardening tests for use-after-free and atomic wrapping.
Diffstat (limited to 'drivers/watchdog/Makefile')
-rw-r--r--drivers/watchdog/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index efc4f788e0f2..14bd772d3e66 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -180,6 +180,7 @@ obj-$(CONFIG_SH_WDT) += shwdt.o
obj-$(CONFIG_WATCHDOG_RIO) += riowd.o
obj-$(CONFIG_WATCHDOG_CP1XXX) += cpwd.o
+obj-$(CONFIG_WATCHDOG_SUN4V) += sun4v_wdt.o
# XTENSA Architecture