aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2004-01-07 13:17:32 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2004-01-07 13:17:32 +0000
commit8b4e09623c0685b7113ab838a3cec89357636873 (patch)
treeac0c460ef94ffa9320ceaa6863361bbdbabf6cda /kernel
parentf85ab249900582dc9b212d89622bb4b361ef24f2 (diff)
downloadlibfuse-8b4e09623c0685b7113ab838a3cec89357636873.tar.gz
new version
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Makefile.in5
-rw-r--r--kernel/util.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index f1bf8a1..4015069 100644
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -5,7 +5,6 @@ INSTALL = @INSTALL@
mkinstalldirs = $(SHELL) ../mkinstalldirs
majver = @majver@
-EXTRA_CFLAGS := -I$(PWD)/../include
DISTFILES = Makefile.in dev.c dir.c file.c inode.c util.c fuse_i.h
fusemoduledir = @kmoduledir@/kernel/fs/fuse
@@ -44,7 +43,7 @@ ifeq ($(majver), 2.4)
CC = @CC@
LD = @LD@
CFLAGS = -O2 -Wall -Wstrict-prototypes -fno-strict-aliasing -pipe
-CPPFLAGS = -I@kernelsrc@/include -I../include -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES
+CPPFLAGS = -I@kernelsrc@/include -I../include -D__KERNEL__ -DMODULE -D_LOOSE_KERNEL_NAMES -DFUSE_VERSION=\"@VERSION@\"
fuse_objs = dev.o dir.o file.o inode.o util.o
@@ -68,6 +67,8 @@ util.o: $(fuse_headers)
else
+EXTRA_CFLAGS := -I$(PWD)/../include -DFUSE_VERSION=\"@VERSION@\"
+
obj-m := fuse.o
fuse-objs := dev.o dir.o file.o inode.o util.o
diff --git a/kernel/util.c b/kernel/util.c
index 7296517..6764157 100644
--- a/kernel/util.c
+++ b/kernel/util.c
@@ -31,7 +31,9 @@ int __init fuse_init(void)
{
int res;
- printk(KERN_DEBUG "fuse init (version %i)\n", FUSE_KERNEL_VERSION);
+ printk(KERN_DEBUG "fuse init %s (API version %i.%i)\n",
+ FUSE_VERSION,
+ FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION);
res = fuse_fs_init();
if(res)