diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-06-03 20:33:06 +1000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-06-03 20:33:06 +1000 |
| commit | bc94e59662c13516d13e117b6edab4bec487d5a0 (patch) | |
| tree | e3e301874bcc669a19546102c3ceab584fdd3d14 /crypto | |
| parent | 749d811f10a410b64cf4c674c498ec04316ec373 (diff) | |
| download | linux-stable-bc94e59662c13516d13e117b6edab4bec487d5a0.tar.gz linux-stable-bc94e59662c13516d13e117b6edab4bec487d5a0.tar.bz2 linux-stable-bc94e59662c13516d13e117b6edab4bec487d5a0.zip | |
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>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 7 | ||||
| -rw-r--r-- | crypto/Makefile | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 9d9434f08c92..11d0f21fd417 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -80,6 +80,11 @@ config CRYPTO_RNG2 config CRYPTO_PCOMP tristate + select CRYPTO_PCOMP2 + select CRYPTO_ALGAPI + +config CRYPTO_PCOMP2 + tristate select CRYPTO_ALGAPI2 config CRYPTO_MANAGER @@ -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 d7e6441df7fe..d1cfa051afe4 100644 --- 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 |