diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 16:18:36 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 16:18:36 +1100 |
commit | 4783f393de3077211c14675a0e57c8a02e9190b0 (patch) | |
tree | 6c37d8664eb072fd026db3706481d771da4495ca /fs/ceph/Kconfig | |
parent | 9f5f9ffe50e90ed73040d2100db8bfc341cee352 (diff) | |
parent | 5b8544c38e6fde6968645afd46ff681492192b86 (diff) | |
download | linux-4783f393de3077211c14675a0e57c8a02e9190b0.tar.gz linux-4783f393de3077211c14675a0e57c8a02e9190b0.tar.bz2 linux-4783f393de3077211c14675a0e57c8a02e9190b0.zip |
Merge remote branch 'kumar/merge' into next
Diffstat (limited to 'fs/ceph/Kconfig')
-rw-r--r-- | fs/ceph/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/Kconfig b/fs/ceph/Kconfig index bc87b9c1d27e..0fcd2640c23f 100644 --- a/fs/ceph/Kconfig +++ b/fs/ceph/Kconfig @@ -3,6 +3,7 @@ config CEPH_FS depends on INET && EXPERIMENTAL select LIBCRC32C select CRYPTO_AES + select CRYPTO help Choose Y or M here to include support for mounting the experimental Ceph distributed file system. Ceph is an extremely |