diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Makefile.in | 9 | ||||
| -rw-r--r-- | kernel/fuse_i.h | 4 | ||||
| -rw-r--r-- | kernel/fuse_kernel.h (renamed from kernel/linux/fuse.h) | 0 |
3 files changed, 6 insertions, 7 deletions
diff --git a/kernel/Makefile.in b/kernel/Makefile.in index 42d1807..2cb000e 100644 --- a/kernel/Makefile.in +++ b/kernel/Makefile.in @@ -7,9 +7,8 @@ majver = @majver@ VERSION = @PACKAGE_VERSION@ DISTFILES = Makefile.in configure.ac configure config.h.in ../install-sh \ - dev.c dir.c file.c inode.c util.c fuse_i.h + dev.c dir.c file.c inode.c util.c fuse_i.h fuse_kernel.h COMPATDISTFILES = compat/parser.c compat/parser.h -LINUXDISTFILES = linux/fuse.h fusemoduledir = @kmoduledir@/kernel/fs/fuse @@ -40,12 +39,10 @@ distclean: clean maintainer-clean: distclean -distdir: $(DISTFILES) $(COMPATDISTFILES) $(LINUXDISTFILES) +distdir: $(DISTFILES) $(COMPATDISTFILES) cp -p $(DISTFILES) $(distdir) mkdir $(distdir)/compat cp -p $(COMPATDISTFILES) $(distdir)/compat - mkdir $(distdir)/linux - cp -p $(LINUXDISTFILES) $(distdir)/linux ifeq ($(majver), 2.4) @@ -66,7 +63,7 @@ all-spec: fuse.o fuse.o: $(fuse_objs) $(LD) -r -o fuse.o $(fuse_objs) -fuse_headers = fuse_i.h linux/fuse.h +fuse_headers = fuse_i.h fuse_kernel.h dev.o: $(fuse_headers) dir.o: $(fuse_headers) diff --git a/kernel/fuse_i.h b/kernel/fuse_i.h index b9dd4b8..0597621 100644 --- a/kernel/fuse_i.h +++ b/kernel/fuse_i.h @@ -6,8 +6,10 @@ See the file COPYING. */ +#ifdef FUSE_MAINLINE #include <linux/fuse.h> -#ifndef FUSE_MAINLINE +#else +#include "fuse_kernel.h" #include <linux/version.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) diff --git a/kernel/linux/fuse.h b/kernel/fuse_kernel.h index 63973a7..63973a7 100644 --- a/kernel/linux/fuse.h +++ b/kernel/fuse_kernel.h |