crypto: pcomp - Fix illegal Kconfig configuration

The PCOMP Kconfig entry current allows the following combination
which is illegal:

ZLIB=y
PCOMP=y
ALGAPI=m
ALGAPI2=y
MANAGER=m
MANAGER2=m

This patch fixes this by adding PCOMP2 so that PCOMP can select
ALGAPI to propagate the setting to MANAGER2.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 9d9434f08c92278293838c266f7b5108b3414bd2..11d0f21fd4175d3a780a267370c0cff88c8eaaa3 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -79,6 +79,11 @@ config CRYPTO_RNG2
        select CRYPTO_ALGAPI2
 
 config CRYPTO_PCOMP
+       tristate
+       select CRYPTO_PCOMP2
+       select CRYPTO_ALGAPI
+
+config CRYPTO_PCOMP2
        tristate
        select CRYPTO_ALGAPI2
 
@@ -94,7 +99,7 @@ config CRYPTO_MANAGER2
        select CRYPTO_AEAD2
        select CRYPTO_HASH2
        select CRYPTO_BLKCIPHER2
-       select CRYPTO_PCOMP
+       select CRYPTO_PCOMP2
 
 config CRYPTO_GF128MUL
        tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"

diff --git a/crypto/Makefile b/crypto/Makefile
index d7e6441df7fe97fe46df51e2e6c8d8a37a57efc1..d1cfa051afe4753c20382e62776d905bb97871f8 100644 (file)
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -26,7 +26,7 @@ crypto_hash-objs += ahash.o
 crypto_hash-objs += shash.o
 obj-$(CONFIG_CRYPTO_HASH2) += crypto_hash.o
 
-obj-$(CONFIG_CRYPTO_PCOMP) += pcompress.o
+obj-$(CONFIG_CRYPTO_PCOMP2) += pcompress.o
 
 cryptomgr-objs := algboss.o testmgr.o