diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-09 12:20:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-09 12:20:41 +0000 |
| commit | 0d6c1ba342ec528e952c4c99833cd4802918f9c7 (patch) | |
| tree | 3f9b77b397ec915c0eb026a9b6425e82fa843e67 /crypto/Makefile | |
| parent | 3e39d71f9e785538cfb91cd75e7f169bb2a34d5b (diff) | |
| parent | 46cc85f2e4aef88c237a0407cf5d163619a4d565 (diff) | |
| download | linux-crypto-0d6c1ba342ec528e952c4c99833cd4802918f9c7.tar.gz linux-crypto-0d6c1ba342ec528e952c4c99833cd4802918f9c7.zip | |
Merge tag 'v4.10-rc1' into spi-s3c64xx
Linux 4.10-rc1
Diffstat (limited to 'crypto/Makefile')
| -rw-r--r-- | crypto/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index bd6a0290..b8f0e3eb 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -51,6 +51,10 @@ rsa_generic-y += rsa_helper.o rsa_generic-y += rsa-pkcs1pad.o obj-$(CONFIG_CRYPTO_RSA) += rsa_generic.o +crypto_acompress-y := acompress.o +crypto_acompress-y += scompress.o +obj-$(CONFIG_CRYPTO_ACOMP2) += crypto_acompress.o + cryptomgr-y := algboss.o testmgr.o obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o @@ -139,3 +143,5 @@ obj-$(CONFIG_ASYNC_CORE) += async_tx/ obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/ obj-$(CONFIG_CRYPTO_HASH_INFO) += hash_info.o obj-$(CONFIG_CRYPTO_ABLK_HELPER) += ablk_helper.o +crypto_simd-y := simd.o +obj-$(CONFIG_CRYPTO_SIMD) += crypto_simd.o |