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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
mn10300
/
kernel
/
mn10300-watchdog.c
diff --git
a/arch/mn10300/kernel/mn10300-watchdog.c
b/arch/mn10300/kernel/mn10300-watchdog.c
index 2e370d88a87a22d7302f6dd386bf85a7dbe2ae97..f362d9d138f1ad90012d5fa5e69f1f8b387dbcba 100644
(file)
--- a/
arch/mn10300/kernel/mn10300-watchdog.c
+++ b/
arch/mn10300/kernel/mn10300-watchdog.c
@@
-25,7
+25,7
@@
#include <asm/div64.h>
#include <asm/smp.h>
#include <asm/gdb-stub.h>
-#include <
asm/
proc/clock.h>
+#include <proc/clock.h>
static DEFINE_SPINLOCK(watchdog_print_lock);
static unsigned int watchdog;