From b9b94cdd0a05ff3cba661fda58279e4bdc74db5c Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Wed, 1 Dec 2004 18:56:39 +0000
Subject: merge from merge4 to merge5

---
 kernel/fuse_i.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'kernel/fuse_i.h')

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)
-- 
cgit v1.2.3