diff --git a/[refs] b/[refs] index a3ffa78f085b..3bb3cf6aa5d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b94895b9281976cf2a0f2f89bf41ee219742235 +refs/heads/master: 3e8c54fad89144b8d63cc41619f363df1ec7cc42 diff --git a/trunk/include/linux/fuse.h b/trunk/include/linux/fuse.h index 5425b60021e3..8e4319614bef 100644 --- a/trunk/include/linux/fuse.h +++ b/trunk/include/linux/fuse.h @@ -9,6 +9,7 @@ /* This file defines the kernel interface of FUSE */ #include +#include /** Version number of this interface */ #define FUSE_KERNEL_VERSION 7 @@ -20,7 +21,7 @@ #define FUSE_ROOT_ID 1 /** The major number of the fuse character device */ -#define FUSE_MAJOR 10 +#define FUSE_MAJOR MISC_MAJOR /** The minor number of the fuse character device */ #define FUSE_MINOR 229