Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[~andy/linux] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 2754f2bf5d91391a24e87359d44052a419ae0e49..aca01164f00200a8d14efa8a82e4a400b67d0bf1 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1317,6 +1317,22 @@ config CRYPTO_842
        help
          This is the 842 algorithm.
 
+config CRYPTO_LZ4
+       tristate "LZ4 compression algorithm"
+       select CRYPTO_ALGAPI
+       select LZ4_COMPRESS
+       select LZ4_DECOMPRESS
+       help
+         This is the LZ4 algorithm.
+
+config CRYPTO_LZ4HC
+       tristate "LZ4HC compression algorithm"
+       select CRYPTO_ALGAPI
+       select LZ4HC_COMPRESS
+       select LZ4_DECOMPRESS
+       help
+         This is the LZ4 high compression mode algorithm.
+
 comment "Random Number Generation"
 
 config CRYPTO_ANSI_CPRNG