X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Ffuse%2Fpatches%2F230-kobj.patch;h=ecbdb5a6f7ae0ee0fab17d1c98ffdca36e61c5b6;hb=4e7d27c89015a1ca768e10254b1eb472d3e8021c;hp=88f8b6c938f369e39c85cb836ac219daff2b013e;hpb=546d769c67ae337575297359e5875f72025e5e76;p=openwrt-10.03%2F.git

diff --git a/package/fuse/patches/230-kobj.patch b/package/fuse/patches/230-kobj.patch
index 88f8b6c93..ecbdb5a6f 100644
--- a/package/fuse/patches/230-kobj.patch
+++ b/package/fuse/patches/230-kobj.patch
@@ -1,17 +1,25 @@
---- 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
-@@ -858,12 +858,12 @@
+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;
  #endif
--	kset_set_kset_s(&fuse_subsys, fs_subsys);
++#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);
++#endif
  	err = subsystem_register(&fuse_subsys);
  	if (err)
  		goto out_err;
  
--	kset_set_kset_s(&connections_subsys, fuse_subsys);
++#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);
++#endif
  	err = subsystem_register(&connections_subsys);
  	if (err)
  		goto out_fuse_unregister;