1 diff -up fuse-2.9.2/include/fuse_kernel.h.conflictfix fuse-2.9.2/include/fuse_kernel.h
2 --- fuse-2.9.2/include/fuse_kernel.h.conflictfix 2013-06-26 09:31:57.862198038 -0400
3 +++ fuse-2.9.2/include/fuse_kernel.h 2013-06-26 09:32:19.679198365 -0400
8 -#include <sys/types.h>
10 +#include <linux/types.h>
13 #define __u64 uint64_t
15 #define __u32 uint32_t
17 #define __u16 uint16_t
21 * Version negotiation: