diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-31 13:59:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-31 13:59:55 +0100 |
| commit | 68066bb378a0504439e046cdb55d88362eb6379d (patch) | |
| tree | 0b60f72ddf7108a63dd4db617b42e07fbae5346d /drivers/watchdog/max63xx_wdt.c | |
| parent | spi: dw: fix memory leak on error path (diff) | |
| parent | Linux 3.13-rc6 (diff) | |
| download | linux-68066bb378a0504439e046cdb55d88362eb6379d.tar.xz linux-68066bb378a0504439e046cdb55d88362eb6379d.zip | |
Merge tag 'v3.13-rc6' into spi-dw
To resolve trivial overlaps with fixes.
Linux 3.13-rc6
Diffstat (limited to 'drivers/watchdog/max63xx_wdt.c')
| -rw-r--r-- | drivers/watchdog/max63xx_wdt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c index 6d4f3998e1f6..bdb3f4a5b27c 100644 --- a/drivers/watchdog/max63xx_wdt.c +++ b/drivers/watchdog/max63xx_wdt.c @@ -19,7 +19,6 @@ #include <linux/moduleparam.h> #include <linux/types.h> #include <linux/kernel.h> -#include <linux/miscdevice.h> #include <linux/watchdog.h> #include <linux/init.h> #include <linux/bitops.h> |