Merge tag 'iwlwifi-for-john-2014-11-03' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / net / netrom / nr_in.c

diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c
index c3073a2ef6342f32528cbc04cec65c08789749ee..80dbd0beb51675f53a91f930cec7a1c143d28fac 100644 (file)
--- a/net/netrom/nr_in.c
+++ b/net/netrom/nr_in.c
@@ -23,7 +23,7 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/fcntl.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>