summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-01-16 18:54:08 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-21 14:39:05 -0800
commit38db331b578005d32155bb6f6a80654ef127cff5 (patch)
tree2b738e2eaae10d18b0468cb1cd760e18b7205796
parentd0e09c80f0391a9a5fe1b2a650eaaed363f85bff (diff)
downloadlinux-38db331b578005d32155bb6f6a80654ef127cff5.tar.gz
linux-38db331b578005d32155bb6f6a80654ef127cff5.tar.bz2
linux-38db331b578005d32155bb6f6a80654ef127cff5.zip
fs/btrfs: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it from any "depends on" lines in Kconfigs. Cc: Chris Mason <chris.mason@fusionio.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/btrfs/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig
index d33f01c08b60..ccd25ba7a9ac 100644
--- a/fs/btrfs/Kconfig
+++ b/fs/btrfs/Kconfig
@@ -1,6 +1,5 @@
config BTRFS_FS
- tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
- depends on EXPERIMENTAL
+ tristate "Btrfs filesystem Unstable disk format"
select LIBCRC32C
select ZLIB_INFLATE
select ZLIB_DEFLATE