Merge Linus' latest into master

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

diff --git a/drivers/watchdog/ixp2000_wdt.c b/drivers/watchdog/ixp2000_wdt.c
index a77f69d528779663710b07f4d89f53271a688056..4f4b35a20d84ed6642fb789b49e6c601b8742d86 100644 (file)
--- a/drivers/watchdog/ixp2000_wdt.c
+++ b/drivers/watchdog/ixp2000_wdt.c
@@ -26,8 +26,7 @@
 #include <linux/init.h>
 #include <linux/bitops.h>
 #include <linux/uaccess.h>
-
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
 static int nowayout = WATCHDOG_NOWAYOUT;
 static unsigned int heartbeat = 60;    /* (secs) Default is 1 minute */