Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

[sfrench/cifs-2.6.git] / fs / reiserfs / xattr_user.c

diff --git a/fs/reiserfs/xattr_user.c b/fs/reiserfs/xattr_user.c
index 8667491ae7c3ef864a1be3270325c19d6189b80a..e50eab0464711f6ebe363ca9f2bd7ff7767aab12 100644 (file)
--- a/fs/reiserfs/xattr_user.c
+++ b/fs/reiserfs/xattr_user.c
@@ -4,7 +4,7 @@
 #include <linux/pagemap.h>
 #include <linux/xattr.h>
 #include "xattr.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 static int
 user_get(struct dentry *dentry, const char *name, void *buffer, size_t size,