Add Btrfs to fs/Kconfig and fs/Makefile

Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/Kconfig b/fs/Kconfig
index abccb5d..18f5a85 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -497,6 +497,23 @@
 	  this option for debugging only as it is likely to decrease
 	  performance of the filesystem.
 
+config BTRFS_FS
+	tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
+	depends on EXPERIMENTAL
+	select LIBCRC32C
+	help
+	  Btrfs is a new filesystem with extents, writable snapshotting,
+	  support for multiple devices and many more features.
+
+	  Btrfs is highly experimental, and THE DISK FORMAT IS NOT YET
+	  FINALIZED.  You should say N here unless you are interested in
+	  testing Btrfs with non-critical data.
+
+	  To compile this file system support as a module, choose M here. The
+	  module will be called btrfs.
+
+	  If unsure, say N.
+
 endif # BLOCK
 
 config DNOTIFY
diff --git a/fs/Makefile b/fs/Makefile
index a1482a5..41fcc85 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -121,4 +121,5 @@
 obj-$(CONFIG_HPPFS)		+= hppfs/
 obj-$(CONFIG_DEBUG_FS)		+= debugfs/
 obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
+obj-$(CONFIG_BTRFS_FS)		+= btrfs/
 obj-$(CONFIG_GFS2_FS)           += gfs2/