oops, forgot to remove defaults from 'x86/base-files/' in [9069]

[openwrt.git] / package / fuse / patches / 230-kobj.patch

diff --git a/package/fuse/patches/230-kobj.patch b/package/fuse/patches/230-kobj.patch
index 684402f..ecbdb5a 100644 (file)
--- a/package/fuse/patches/230-kobj.patch
+++ b/package/fuse/patches/230-kobj.patch
@@ -1,5 +1,7 @@
---- fuse.old/kernel/inode.c    2007-05-29 07:31:43.000000000 +0100
-+++ fuse.dev/kernel/inode.c    2007-05-29 07:29:42.000000000 +0100
+Index: fuse-2.6.5/kernel/inode.c
+===================================================================
+--- fuse-2.6.5.orig/kernel/inode.c     2007-06-23 13:03:51.000000000 +0200
++++ fuse-2.6.5/kernel/inode.c  2007-06-23 13:03:51.000000000 +0200

 @@ -858,12 +858,20 @@
        if (err)
                return err;
 @@ -858,12 +858,20 @@
        if (err)
                return err;


@@ -7,7 +9,7 @@
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 +      kobj_set_kset_s(&fuse_subsys, fs_subsys);
 +#else
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 +      kobj_set_kset_s(&fuse_subsys, fs_subsys);
 +#else

-       kset_set_kset_s(&fuse_subsys, fs_subsys);
+       kset_set_kset_s(&fuse_subsys, fs_subsys);

 +#endif
        err = subsystem_register(&fuse_subsys);
        if (err)
 +#endif
        err = subsystem_register(&fuse_subsys);
        if (err)


@@ -16,7 +18,7 @@
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 +      kobj_set_kset_s(&connections_subsys, fuse_subsys);
 +#else
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 +      kobj_set_kset_s(&connections_subsys, fuse_subsys);
 +#else

-       kset_set_kset_s(&connections_subsys, fuse_subsys);
+       kset_set_kset_s(&connections_subsys, fuse_subsys);

 +#endif
        err = subsystem_register(&connections_subsys);
        if (err)
 +#endif
        err = subsystem_register(&connections_subsys);
        if (err)