|author||Patrick McHardy <email@example.com>||2013-03-31 18:10:34 +0200|
|committer||Patrick McHardy <firstname.lastname@example.org>||2013-03-31 18:10:34 +0200|
Merge tag 'v3.8' of /home/kaber/src/repos/linux
Linux 3.8 Signed-off-by: Patrick McHardy <email@example.com> Conflicts: include/linux/Kbuild include/linux/netlink.h
Diffstat (limited to 'fs/fuse/Kconfig')
1 files changed, 14 insertions, 2 deletions
diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig
index 0cf160a94ed..1b2f6c2c3aa 100644
@@ -4,12 +4,24 @@ config FUSE_FS
With FUSE it is possible to implement a fully functional filesystem
in a userspace program.
- There's also companion library: libfuse. This library along with
- utilities is available from the FUSE homepage:
+ There's also a companion library: libfuse2. This library is available
+ from the FUSE homepage:
+ although chances are your distribution already has that library
+ installed if you've installed the "fuse" package itself.
See <file:Documentation/filesystems/fuse.txt> for more information.
See <file:Documentation/Changes> for needed library/utility version.
If you want to develop a userspace FS, or if you want to use
a filesystem based on FUSE, answer Y or M.
+ tristate "Character device in Userspace support"
+ depends on FUSE_FS
+ This FUSE extension allows character devices to be
+ implemented in userspace.
+ If you want to develop or use a userspace character device
+ based on CUSE, answer Y or M.