diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-26 15:21:59 -0400 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-26 15:21:59 -0400 |
| commit | 0f96371a30f16f6244195c717b9e2b2f42aa4e89 (patch) | |
| tree | 3f42b4abf3a7643ddd06f0c7727f2e3b06798c3c /drivers/watchdog/rt2880_wdt.c | |
| parent | e021bb4fb77a8782d21cab4cb0702778fc3784c7 (diff) | |
| parent | ce194fa2b267e2018f42442347d90df01c4071d6 (diff) | |
Merge tag 'v4.19.29' into v4.19-rt
This is the 4.19.29 stable release
Conflicts:
drivers/irqchip/irq-gic-v3-its.c
Diffstat (limited to 'drivers/watchdog/rt2880_wdt.c')
| -rw-r--r-- | drivers/watchdog/rt2880_wdt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c index 98967f0a7d10..db7c57d82cfd 100644 --- a/drivers/watchdog/rt2880_wdt.c +++ b/drivers/watchdog/rt2880_wdt.c @@ -18,6 +18,7 @@ #include <linux/watchdog.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> +#include <linux/mod_devicetable.h> #include <asm/mach-ralink/ralink_regs.h> |