Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index bef2cf00b3be..30aa0dc60d75 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -5,6 +5,7 @@
 #include <linux/mempolicy.h>
 #include <linux/pagemap.h>
 #include <linux/percpu_counter.h>
+#include <linux/xattr.h>
 
 /* inode in-kernel data */
 
@@ -18,7 +19,7 @@ struct shmem_inode_info {
         };
         struct shared_policy    policy;         /* NUMA memory alloc policy */
         struct list_head        swaplist;       /* chain of maybes on swap */
-        struct list_head        xattr_list;     /* list of shmem_xattr */
+        struct simple_xattrs    xattrs;         /* list of xattrs */
         struct inode            vfs_inode;
 };