summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-11-30 17:41:35 +0100
committerTony Lindgren <tony@atomide.com>2012-11-30 17:41:35 +0100
commit0a779abe875655625da46b2e45007ebf50d94d52 (patch)
tree57082b664d2495a9bf8dfed90333dcbb59acdaf2 /drivers/watchdog
parentMerge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-h... (diff)
downloadlinux-0a779abe875655625da46b2e45007ebf50d94d52.tar.xz
linux-0a779abe875655625da46b2e45007ebf50d94d52.zip
watchdog: OMAP: fixup for ARM multiplatform support
Recent changes to the omap_wdt.c removed the dependencies to the core omap code, but forgot to remove mach/hardware.h. We cannot include any plat headers with multiplatform support enabled. cc: Wim Van Sebroeck <wim@iguana.be> cc: linux-watchdog@vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/omap_wdt.c2
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"