Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

[~andy/linux] / net / tipc / core.h

diff --git a/net/tipc/core.h b/net/tipc/core.h
index 94895d4e86abe249f4ef954d527e119647665c92..1ff477b0450d78bacb9522105f638f6523d625f6 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>