aboutsummaryrefslogtreecommitdiffstats
path: root/package/fuse/patches/230-kobj.patch
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-06-10 19:47:55 +0000
committerNicolas Thill <nico@openwrt.org>2007-06-10 19:47:55 +0000
commiteddd751ba737cc406f52094245428da3b220f27a (patch)
tree6749076b6b25124a747faa8a66a404c586b73751 /package/fuse/patches/230-kobj.patch
parentce6260adbccb7dc19ae73355a7f92361ce57ff3b (diff)
downloadupstream-eddd751ba737cc406f52094245428da3b220f27a.tar.gz
upstream-eddd751ba737cc406f52094245428da3b220f27a.tar.bz2
upstream-eddd751ba737cc406f52094245428da3b220f27a.zip
fix fuse (closes: #1847)
SVN-Revision: 7548
Diffstat (limited to 'package/fuse/patches/230-kobj.patch')
-rw-r--r--package/fuse/patches/230-kobj.patch12
1 files changed, 9 insertions, 3 deletions
diff --git a/package/fuse/patches/230-kobj.patch b/package/fuse/patches/230-kobj.patch
index 88f8b6c938..684402f475 100644
--- a/package/fuse/patches/230-kobj.patch
+++ b/package/fuse/patches/230-kobj.patch
@@ -1,17 +1,23 @@
--- 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 @@
+@@ -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;