Merge Linus' latest into master

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

diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index fea398a4ca327189cce6d6b669f03be4cd2b29af..c8d7f1b2df026ccac80f2862667fe14a29466667 100644 (file)
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -28,8 +28,8 @@
 #include <linux/interrupt.h>
 #include <linux/uaccess.h>
 #include <linux/irq.h>
+#include <mach/hardware.h>
 
-#include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/hardware/dec21285.h>