Merge remote-tracking branch 'mkp-scsi/4.10/scsi-fixes' into fixes

[sfrench/cifs-2.6.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index 2d13b4e62faec1cd0e3ff8d5966e767821867a2c..7e3317cf4045523a7d0b17f102d51775808a8950 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -22,7 +22,7 @@
 #include <linux/vmalloc.h>
 #include <linux/posix_acl_xattr.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 static const char *
 strcmp_prefix(const char *a, const char *a_prefix)