diff options
author | Olof Johansson <olof@lixom.net> | 2012-12-13 01:10:45 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-12-13 01:10:45 +0100 |
commit | 9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch) | |
tree | c21ee243e48912201b4041fbf3f9bd9165603bd8 /drivers/watchdog/omap_wdt.c | |
parent | ARM: arm-soc: Merge branch 'next/clk' into next/pm (diff) | |
parent | Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git:/... (diff) | |
download | linux-9c7466b217af784280d9fc841bbd559ef3bf33e9.tar.xz linux-9c7466b217af784280d9fc841bbd559ef3bf33e9.zip |
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/watchdog/omap_wdt.c')
-rw-r--r-- | drivers/watchdog/omap_wdt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 477a1d47a64c..e5e7069aad93 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c @@ -45,8 +45,6 @@ #include <linux/uaccess.h> #include <linux/slab.h> #include <linux/pm_runtime.h> -#include <mach/hardware.h> - #include <linux/platform_data/omap-wd-timer.h> #include "omap_wdt.h" |