Merge tag 'qcom-fixes-for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/fs/locks.c b/fs/locks.c
index 22c5b4aa49611ac46cb50dbf4fc8ef25ec500b34..26811321d39b8d404046100ac3dcc4b5e04f5cc7 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -131,7 +131,7 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/filelock.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #define IS_POSIX(fl)   (fl->fl_flags & FL_POSIX)
 #define IS_FLOCK(fl)   (fl->fl_flags & FL_FLOCK)