diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-07 12:53:35 +1000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-07 12:53:35 +1000 |
| commit | 21e3a539957468d04a7d4f9461332d1199adec16 (patch) | |
| tree | 1862c879e19589359002e0622da83bc6152cbb9c /crypto/Makefile | |
| parent | 796be36a9b84fab6b1a150399ec1f9b2267c0a7e (diff) | |
| parent | 8c4fc164921ed8989d0e8a37d7669e5a81f7b44c (diff) | |
| download | linux-crypto-21e3a539957468d04a7d4f9461332d1199adec16.tar.gz linux-crypto-21e3a539957468d04a7d4f9461332d1199adec16.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to '')
| -rw-r--r-- | crypto/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index 62af87df..2ba0df2f 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -83,9 +83,10 @@ obj-$(CONFIG_CRYPTO_ZLIB) += zlib.o obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o obj-$(CONFIG_CRYPTO_CRC32) += crc32.o -obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif.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_842) += 842.o obj-$(CONFIG_CRYPTO_RNG2) += rng.o obj-$(CONFIG_CRYPTO_RNG2) += krng.o |