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

---
 lib/fuse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/fuse.c')

diff --git a/lib/fuse.c b/lib/fuse.c
index eb10cdf..100b50f 100644
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -8,7 +8,7 @@
 
 #include <config.h>
 #include "fuse_i.h"
-#include <linux/fuse.h>
+#include "fuse_kernel.h"
 
 #include <string.h>
 #include <stdlib.h>
-- 
cgit v1.2.3