diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 17:10:44 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 17:10:44 +0100 |
| commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
| tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /drivers/watchdog/softdog.c | |
| parent | Input: xpad - add new USB IDs for Logitech F310 and F710 (diff) | |
| parent | Input: wacom - add support for DTU-1031 (diff) | |
| download | linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.tar.xz linux-55df811f2066fcaec2548248f0a1a6a0c12dc6b8.zip | |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'drivers/watchdog/softdog.c')
| -rw-r--r-- | drivers/watchdog/softdog.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c index ef2638fee4a8..c04a1aa158e2 100644 --- a/drivers/watchdog/softdog.c +++ b/drivers/watchdog/softdog.c @@ -42,7 +42,6 @@ #include <linux/moduleparam.h> #include <linux/types.h> #include <linux/timer.h> -#include <linux/miscdevice.h> #include <linux/watchdog.h> #include <linux/notifier.h> #include <linux/reboot.h> |