Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

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

diff --git a/fs/Kconfig b/fs/Kconfig
index 522469a7eca391e51f5b0648027785dff24d3569..5f62e7e0e6cb816023734efa27f07a5e9d547396 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -268,6 +268,25 @@ config OCFS2_COMPAT_JBD
          is backwards compatible with JBD.  It is safe to say N here.
          However, if you really want to use the original JBD, say Y here.
 
+config BTRFS_FS
+       tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
+       depends on EXPERIMENTAL
+       select LIBCRC32C
+       select ZLIB_INFLATE
+       select ZLIB_DEFLATE
+       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