projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge Linus' latest into master
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
iop_wdt.c
diff --git
a/drivers/watchdog/iop_wdt.c
b/drivers/watchdog/iop_wdt.c
index 8278b13f77c79eb920956d9520389625147680fa..96eb2cbe5874dd887ba9ec072cdba9031fd2244c 100644
(file)
--- a/
drivers/watchdog/iop_wdt.c
+++ b/
drivers/watchdog/iop_wdt.c
@@
-32,7
+32,7
@@
#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/uaccess.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
static int nowayout = WATCHDOG_NOWAYOUT;
static unsigned long wdt_status;