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 tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.
[firefly-linux-kernel-4.4.55.git]
/
net
/
netrom
/
nr_out.c
diff --git
a/net/netrom/nr_out.c
b/net/netrom/nr_out.c
index 0b4bcb2bf38f3c49f05aa609122a54c7ef6ff21b..00fbf1419ec6bd8138b0793a0ada11fedf441a7d 100644
(file)
--- a/
net/netrom/nr_out.c
+++ b/
net/netrom/nr_out.c
@@
-22,7
+22,7
@@
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <net/sock.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#include <linux/fcntl.h>
#include <linux/mm.h>
#include <linux/interrupt.h>