Merge branch 'for-3.11' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 5a5203ded0dd5c570fb4ac94185b1a956ada6891..35da51359d404180c8214c007195e97ca89563dd 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -66,6 +66,8 @@ config CRC16
 
 config CRC_T10DIF
        tristate "CRC calculation for the T10 Data Integrity Field"
+       select CRYPTO
+       select CRYPTO_CRCT10DIF
        help
          This option is only needed if a module that's not in the
          kernel tree needs to calculate CRC checks for use with the
@@ -192,6 +194,15 @@ config LZO_COMPRESS
 config LZO_DECOMPRESS
        tristate
 
+config LZ4_COMPRESS
+       tristate
+
+config LZ4HC_COMPRESS
+       tristate
+
+config LZ4_DECOMPRESS
+       tristate
+
 source "lib/xz/Kconfig"
 
 #
@@ -216,6 +227,10 @@ config DECOMPRESS_LZO
        select LZO_DECOMPRESS
        tristate
 
+config DECOMPRESS_LZ4
+       select LZ4_DECOMPRESS
+       tristate
+
 #
 # Generic allocator support is selected if needed
 #