diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 04:36:37 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 04:36:37 +0400 |
| commit | 6a8c62f3e97fdf184fde60bc99155476e8e9cd55 (patch) | |
| tree | 71b818d584f79baf1a192df65c758a592a63360d /drivers/watchdog/stmp3xxx_rtc_wdt.c | |
| parent | b46d0c46ccaa366a5bb8ac709fdf2bcaa76221fd (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| download | linux-6a8c62f3e97fdf184fde60bc99155476e8e9cd55.tar.xz | |
Merge 3.13-rc4 into tty-next
We want the fixes in here as well.
Diffstat (limited to 'drivers/watchdog/stmp3xxx_rtc_wdt.c')
| -rw-r--r-- | drivers/watchdog/stmp3xxx_rtc_wdt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c index d667f6b51d35..bb64ae3f47da 100644 --- a/drivers/watchdog/stmp3xxx_rtc_wdt.c +++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c @@ -12,7 +12,6 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/miscdevice.h> #include <linux/watchdog.h> #include <linux/platform_device.h> #include <linux/stmp3xxx_rtc_wdt.h> |