projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cris-for-3.14' of git://jni.nu/cris
[cascardo/linux.git]
/
net
/
tipc
/
core.h
diff --git
a/net/tipc/core.h
b/net/tipc/core.h
index
94895d4
..
1ff477b
100644
(file)
--- a/
net/tipc/core.h
+++ b/
net/tipc/core.h
@@
-47,7
+47,7
@@
#include <linux/mm.h>
#include <linux/timer.h>
#include <linux/string.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#include <linux/interrupt.h>
#include <linux/atomic.h>
#include <asm/hardirq.h>