brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / target / linux / generic / patches-2.6.39 / 040-backport_tmpfs_xattr.patch

diff --git a/target/linux/generic/patches-2.6.39/040-backport_tmpfs_xattr.patch b/target/linux/generic/patches-2.6.39/040-backport_tmpfs_xattr.patch
index e5d8d43..c7ae196 100644 (file)
--- a/target/linux/generic/patches-2.6.39/040-backport_tmpfs_xattr.patch
+++ b/target/linux/generic/patches-2.6.39/040-backport_tmpfs_xattr.patch
@@ -409,7 +409,7 @@
  
  static struct dentry *shmem_get_parent(struct dentry *child)
  {
  
  static struct dentry *shmem_get_parent(struct dentry *child)
  {

-@@ -2402,8 +2606,10 @@ int shmem_fill_super(struct super_block 
+@@ -2402,8 +2606,10 @@ int shmem_fill_super(struct super_block

        sb->s_magic = TMPFS_MAGIC;
        sb->s_op = &shmem_ops;
        sb->s_time_gran = 1;
        sb->s_magic = TMPFS_MAGIC;
        sb->s_op = &shmem_ops;
        sb->s_time_gran = 1;