VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2009-01-09 13:01:38 -0800 committer: Linus Torvalds <torvalds@linux-foundation.org> 2009-01-09 13:01:38 -0800 commit: 73d59314e6ed268d6f322ae1bdd723b23fa5a4ed parent: 6ddaab20c32af03d68de00e7c97ae8d9820e4dab

Commit Summary:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

Diffstat:

1 file changed, 1 insertion, 0 deletions

diff --git a/fs/Makefile b/fs/Makefile
index c830611550d3..bc4e14df1082 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -119,4 +119,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/