diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 08:10:44 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 08:10:44 -0800 |
commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /drivers/watchdog/rt2880_wdt.c | |
parent | 8e2f2325b73f3e5e46ecffd291556f33b8e3f8c9 (diff) | |
parent | 497ab1f290a26fa9414c5c316515f1e2ddba0803 (diff) |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'drivers/watchdog/rt2880_wdt.c')
-rw-r--r-- | drivers/watchdog/rt2880_wdt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c index 53d37fea183..d92c2d5859c 100644 --- a/drivers/watchdog/rt2880_wdt.c +++ b/drivers/watchdog/rt2880_wdt.c @@ -16,7 +16,6 @@ #include <linux/module.h> #include <linux/kernel.h> #include <linux/watchdog.h> -#include <linux/miscdevice.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> |