ARM: Merge for-2637/s3c24xx/rx1950

[net-next-2.6.git] / fs / btrfs / Kconfig

diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig
index 402afe0a0bfbbab01e307800716c8b2553dc6479..7bb3c020e570d9a1e0d2d640f6c9127df8e57a01 100644 (file)
--- a/fs/btrfs/Kconfig
+++ b/fs/btrfs/Kconfig
@@ -4,7 +4,6 @@ config BTRFS_FS
        select LIBCRC32C
        select ZLIB_INFLATE
        select ZLIB_DEFLATE
-       select FS_JOURNAL_INFO
        help
          Btrfs is a new filesystem with extents, writable snapshotting,
          support for multiple devices and many more features.