summaryrefslogtreecommitdiffstats
path: root/fs/Makefile
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-11-19 15:59:28 -0500
committerChris Mason <chris.mason@oracle.com>2008-11-19 15:59:28 -0500
commitae20a6afec1cf21919d97303f2d8b737eac5acc7 (patch)
treea4ddf02d4f19bdee1119dcc8a0f54edb40fb5986 /fs/Makefile
parent9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff)
parent07103a3cdb24099324a11be1f35279b463cdfc31 (diff)
downloadlinux-ae20a6afec1cf21919d97303f2d8b737eac5acc7.tar.gz
linux-ae20a6afec1cf21919d97303f2d8b737eac5acc7.tar.bz2
linux-ae20a6afec1cf21919d97303f2d8b737eac5acc7.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
Diffstat (limited to 'fs/Makefile')
-rw-r--r--fs/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile
index d9f8afe6f0c4..5fbb23db281c 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -121,4 +121,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/