diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2004-12-01 18:56:39 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2004-12-01 18:56:39 +0000 |
| commit | b9b94cdd0a05ff3cba661fda58279e4bdc74db5c (patch) | |
| tree | 79461f2a8fe5ea8aeb83cf312b542919d69e67e1 /kernel/fuse_i.h | |
| parent | 039322d8f1295bf20057303882bf1202a03d125e (diff) | |
| download | libfuse-b9b94cdd0a05ff3cba661fda58279e4bdc74db5c.tar.gz | |
merge from merge4 to merge5
Diffstat (limited to 'kernel/fuse_i.h')
| -rw-r--r-- | kernel/fuse_i.h | 4 |
1 files changed, 3 insertions, 1 deletions
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) |