Merge branch 'upstream-fixes' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6-omap-h63xx.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index 15158309dee4ae42d2caf7429c274e20945efcbf..1972da186272906d8aa13eab878b547e44ae1398 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -89,11 +89,13 @@ 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/
 obj-$(CONFIG_JFS_FS)           += jfs/
 obj-$(CONFIG_XFS_FS)           += xfs/
+obj-$(CONFIG_9P_FS)            += 9p/
 obj-$(CONFIG_AFS_FS)           += afs/
 obj-$(CONFIG_BEFS_FS)          += befs/
 obj-$(CONFIG_HOSTFS)           += hostfs/