Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / fs / fuse / Makefile

diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile
index c34e268a0ed34349dedf3521b4b73dd73c2ce744..72437065f6adee64994145be01efd281c482596a 100644 (file)
--- a/fs/fuse/Makefile
+++ b/fs/fuse/Makefile
@@ -4,4 +4,4 @@
 
 obj-$(CONFIG_FUSE_FS) += fuse.o
 
-fuse-objs := dev.o dir.o inode.o
+fuse-objs := dev.o dir.o file.o inode.o control.o