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

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

diff --git a/fs/Kconfig b/fs/Kconfig
index abccb5dab9a8b3297e1b41a9c76631a357de935e..18f5a85b47c667a90e3cc8048a76c41fa85a7a8d 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -497,6 +497,23 @@ config OCFS2_DEBUG_FS
          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