Merge Linus' latest into master

[linux-2.6-omap-h63xx.git] / drivers / watchdog / ep93xx_wdt.c

diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 07b74a768922b8e2a5a7619d283aa37fbf558997..e9f950ff86eaee3e685bd35b4eb9c17221da4cde 100644 (file)
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -29,8 +29,7 @@
 #include <linux/watchdog.h>
 #include <linux/timer.h>
 #include <linux/uaccess.h>
-
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 #define WDT_VERSION    "0.3"
 #define PFX            "ep93xx_wdt: "