diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-20 08:30:50 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-20 08:30:50 -0800 |
| commit | cd15c51d6c2f577f896471a058f33a95f164dba2 (patch) | |
| tree | 9d42b8ea581ca35bdf75467b8bbbab21e7056ff9 /drivers/watchdog/max63xx_wdt.c | |
| parent | 5b8314a98888b12159d0b1b14982b8dd2d94e3f5 (diff) | |
| parent | 130f769e81fc472beb2211320777e26050e3fa15 (diff) | |
Merge tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
I accidentally removed some mux code for omap4 that I thought was
dead code as omap4 has been booting with device tree only since
v3.10. Turns out I also removed some display related mux code,
so let's revert that except for the dead code parts.
* tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (439 commits)
Revert "ARM: OMAP2+: Remove legacy mux code for display.c"
+Linux 3.13-rc4
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> |