diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 11:30:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 11:30:10 -0800 |
| commit | 9538e10086bd1301fe915683b1ba0a1de66d7483 (patch) | |
| tree | 5fe464dca440c75843b04cbad1ee703ca82a96e9 /drivers/watchdog/bcm2835_wdt.c | |
| parent | 5e0af24cee56e75d0cb13dc072539acb52f694cf (diff) | |
| parent | dace8bbfccfd9e4fcccfffcfbd82881fda3e756f (diff) | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
"Drop the unnecessary miscdevice.h includes that we forgot in commit
487722cf2d66 ("watchdog: Get rid of MODULE_ALIAS_MISCDEV statements")
and fix an oops for the sc1200_wdt driver"
* git://www.linux-watchdog.org/linux-watchdog:
sc1200_wdt: Fix oops
watchdog: Drop unnecessary include of miscdevice.h
Diffstat (limited to 'drivers/watchdog/bcm2835_wdt.c')
| -rw-r--r-- | drivers/watchdog/bcm2835_wdt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index a6a2cebb2587..cafa973c43be 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -19,7 +19,6 @@ #include <linux/watchdog.h> #include <linux/platform_device.h> #include <linux/of_address.h> -#include <linux/miscdevice.h> #define PM_RSTC 0x1c #define PM_WDOG 0x24 |