Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / fs / pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index 8e0d9f26dfadc4b5849a9f46a933a89ea2aa49ca..73b84baf58f8751393a3adda7cd288fbd044d252 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -23,7 +23,7 @@
 #include <linux/fcntl.h>
 #include <linux/memcontrol.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/ioctls.h>
 
 #include "internal.h"