summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorGiovanni Cabiddu <giovanni.cabiddu@intel.com>2016-10-26 11:56:45 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2016-11-01 01:37:15 +0100
commit6c0f40005ce4ada880f684d9d15fd05b076ee2c4 (patch)
tree1dd60dee494de62a765f78020013a63abd585a30 /crypto
parentcrypto: caam - fix type mismatch warning (diff)
downloadlinux-6c0f40005ce4ada880f684d9d15fd05b076ee2c4.tar.xz
linux-6c0f40005ce4ada880f684d9d15fd05b076ee2c4.zip
crypto: acomp - fix dependency in Makefile
Fix dependency between acomp and scomp that appears when acomp is built as module Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/Makefile b/crypto/Makefile
index 5c83f3dea119..82ffeee1be52 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -50,8 +50,9 @@ rsa_generic-y += rsa_helper.o
rsa_generic-y += rsa-pkcs1pad.o
obj-$(CONFIG_CRYPTO_RSA) += rsa_generic.o
-obj-$(CONFIG_CRYPTO_ACOMP2) += acompress.o
-obj-$(CONFIG_CRYPTO_ACOMP2) += scompress.o
+crypto_acompress-y := acompress.o
+crypto_acompress-y += scompress.o
+obj-$(CONFIG_CRYPTO_ACOMP2) += crypto_acompress.o
cryptomgr-y := algboss.o testmgr.o