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

[mirror_ubuntu-zesty-kernel.git] / drivers / char / lp.c

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index c4094c4e22c11dda9647d3d472a18203f98f9649..5b6742770656746e3f0f6c2c88c439253a5122fb 100644 (file)
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -134,7 +134,7 @@
 #include <linux/lp.h>
 
 #include <asm/irq.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 /* if you have more than 8 printers, remember to increase LP_NO */
 #define LP_NO 8