aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/Makefile
diff options
context:
space:
mode:
authorChanho Min <chanho.min@lge.com>2013-07-08 16:01:51 -0700
committerSimon Shields <keepcalm444@gmail.com>2016-06-12 21:20:14 +1000
commitaf358596dc922c13d1cf7319513e3371258bfe04 (patch)
tree88cf71915203a4443d5df185ff535c2e27f7cd39 /crypto/Makefile
parente587fc7e1422e54b05f8b92b601bc09ebe5ca22b (diff)
downloadkernel_samsung_smdk4412-af358596dc922c13d1cf7319513e3371258bfe04.zip
kernel_samsung_smdk4412-af358596dc922c13d1cf7319513e3371258bfe04.tar.gz
kernel_samsung_smdk4412-af358596dc922c13d1cf7319513e3371258bfe04.tar.bz2
crypto: add lz4 Cryptographic API
Add support for lz4 and lz4hc compression algorithm using the lib/lz4/* codebase. [akpm@linux-foundation.org: fix warnings] Signed-off-by: Chanho Min <chanho.min@lge.com> Cc: "Darrick J. Wong" <djwong@us.ibm.com> Cc: Bob Pearson <rpearson@systemfabricworks.com> Cc: Richard Weinberger <richard@nod.at> Cc: Herbert Xu <herbert@gondor.hengli.com.au> Cc: Yann Collet <yann.collet.73@gmail.com> Cc: Kyungsik Lee <kyungsik.lee@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Conflicts: crypto/Kconfig crypto/Makefile Change-Id: Ic3495647e3a902a12ae1b1951ff9bd89011696e0
Diffstat (limited to 'crypto/Makefile')
-rw-r--r--crypto/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index 69c46ed..a6c3035 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -85,6 +85,8 @@ obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
obj-$(CONFIG_CRYPTO_LZO) += lzo.o
+obj-$(CONFIG_CRYPTO_LZ4) += lz4.o
+obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o
obj-$(CONFIG_CRYPTO_RNG2) += rng.o
obj-$(CONFIG_CRYPTO_RNG2) += krng.o
obj-$(CONFIG_CRYPTO_ANSI_CPRNG) += ansi_cprng.o