diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 12:31:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 12:31:20 -0400 |
| commit | c34752bc8b3196aee3115d1aa41972604ab0aea8 (patch) | |
| tree | db93341ab4043e1c21d83f0b7dfdbc1798b88845 /fs/fuse/Makefile | |
| parent | 65d52cc9d47975f4fbd0a50e62f4a49be2c0514a (diff) | |
| parent | 151060ac13144208bd7601d17e4c92c59b98072f (diff) | |
Merge branch 'cuse' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'cuse' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
CUSE: implement CUSE - Character device in Userspace
fuse: export symbols to be used by CUSE
fuse: update fuse_conn_init() and separate out fuse_conn_kill()
fuse: don't use inode in fuse_file_poll
fuse: don't use inode in fuse_do_ioctl() helper
fuse: don't use inode in fuse_sync_release()
fuse: create fuse_do_open() helper for CUSE
fuse: clean up args in fuse_finish_open() and fuse_release_fill()
fuse: don't use inode in helpers called by fuse_direct_io()
fuse: add members to struct fuse_file
fuse: prepare fuse_direct_io() for CUSE
fuse: clean up fuse_write_fill()
fuse: use struct path in release structure
fuse: misc cleanups
Diffstat (limited to 'fs/fuse/Makefile')
| -rw-r--r-- | fs/fuse/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile index 72437065f6ad..e95eeb445e58 100644 --- a/fs/fuse/Makefile +++ b/fs/fuse/Makefile | |||
| @@ -3,5 +3,6 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_FUSE_FS) += fuse.o | 5 | obj-$(CONFIG_FUSE_FS) += fuse.o |
| 6 | obj-$(CONFIG_CUSE) += cuse.o | ||
| 6 | 7 | ||
| 7 | fuse-objs := dev.o dir.o file.o inode.o control.o | 8 | fuse-objs := dev.o dir.o file.o inode.o control.o |