Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually

[deliverable/linux.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index d646502c1efb3c6a53c4a69dccc74a9036363fbe..1972da186272906d8aa13eab878b547e44ae1398 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -89,6 +89,7 @@ obj-$(CONFIG_QNX4FS_FS)               += qnx4/
 obj-$(CONFIG_AUTOFS_FS)                += autofs/
 obj-$(CONFIG_AUTOFS4_FS)       += autofs4/
 obj-$(CONFIG_ADFS_FS)          += adfs/
+obj-$(CONFIG_FUSE_FS)          += fuse/
 obj-$(CONFIG_UDF_FS)           += udf/
 obj-$(CONFIG_RELAYFS_FS)       += relayfs/
 obj-$(CONFIG_SUN_OPENPROMFS)   += openpromfs/