Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

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

diff --git a/fs/Makefile b/fs/Makefile
index 3f8843c62d9899ffae519128a2de2b7869d21c00..38bc735c67ad2ebfe79a4d64d35e6ad01117c8d6 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -54,6 +54,7 @@ obj-$(CONFIG_GENERIC_ACL)     += generic_acl.o
 obj-$(CONFIG_QUOTA)            += dquot.o
 obj-$(CONFIG_QFMT_V1)          += quota_v1.o
 obj-$(CONFIG_QFMT_V2)          += quota_v2.o
+obj-$(CONFIG_QUOTA_TREE)       += quota_tree.o
 obj-$(CONFIG_QUOTACTL)         += quota.o
 
 obj-$(CONFIG_PROC_FS)          += proc/
@@ -119,4 +120,5 @@ obj-$(CONFIG_HOSTFS)                += hostfs/
 obj-$(CONFIG_HPPFS)            += hppfs/
 obj-$(CONFIG_DEBUG_FS)         += debugfs/
 obj-$(CONFIG_OCFS2_FS)         += ocfs2/
+obj-$(CONFIG_BTRFS_FS)         += btrfs/
 obj-$(CONFIG_GFS2_FS)           += gfs2/