diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:51:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:51:19 -0800 |
| commit | d74e026ae5c4d4289c2ca0a9c404eed4f4bb235e (patch) | |
| tree | a718106dac2c21534cf1faa039dadfc8695b58fa /drivers/watchdog/Makefile | |
| parent | Merge tag 'extcon-next-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing (diff) | |
| parent | lkdtm: improve use-after-free tests (diff) | |
| download | linux-dev-d74e026ae5c4d4289c2ca0a9c404eed4f4bb235e.tar.xz linux-dev-d74e026ae5c4d4289c2ca0a9c404eed4f4bb235e.zip | |
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/Makefile | 1 |
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 |