Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[karo-tx-linux.git] / drivers / tty / n_r3964.c

diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c
index 345111467b85026ead297b67f27a70cbf67a867d..305b6490d40532e5f10beceac5410817783c016e 100644 (file)
--- a/drivers/tty/n_r3964.c
+++ b/drivers/tty/n_r3964.c
@@ -65,7 +65,7 @@
 #include <linux/n_r3964.h>
 #include <linux/poll.h>
 #include <linux/init.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 /*#define DEBUG_QUEUE*/