Merge Linus' latest into master

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / ixp4xx_wdt.c

diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
index ef3157dc9ac1349329563027df8fe21a0f894ba2..41264a5f173121c836f73a7ac4d778ff109c2a86 100644 (file)
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@ -23,8 +23,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 int heartbeat = 60;     /* (secs) Default is 1 minute */