diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-06-03 06:33:06 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-06-03 06:33:06 -0400 |
commit | bc94e59662c13516d13e117b6edab4bec487d5a0 (patch) | |
tree | e3e301874bcc669a19546102c3ceab584fdd3d14 /crypto/Kconfig | |
parent | 749d811f10a410b64cf4c674c498ec04316ec373 (diff) |
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/Kconfig')
-rw-r--r-- | crypto/Kconfig | 7 |
1 files changed, 6 insertions, 1 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 | |||
80 | 80 | ||
81 | config CRYPTO_PCOMP | 81 | config CRYPTO_PCOMP |
82 | tristate | 82 | tristate |
83 | select CRYPTO_PCOMP2 | ||
84 | select CRYPTO_ALGAPI | ||
85 | |||
86 | config CRYPTO_PCOMP2 | ||
87 | tristate | ||
83 | select CRYPTO_ALGAPI2 | 88 | select CRYPTO_ALGAPI2 |
84 | 89 | ||
85 | config CRYPTO_MANAGER | 90 | config CRYPTO_MANAGER |
@@ -94,7 +99,7 @@ config CRYPTO_MANAGER2 | |||
94 | select CRYPTO_AEAD2 | 99 | select CRYPTO_AEAD2 |
95 | select CRYPTO_HASH2 | 100 | select CRYPTO_HASH2 |
96 | select CRYPTO_BLKCIPHER2 | 101 | select CRYPTO_BLKCIPHER2 |
97 | select CRYPTO_PCOMP | 102 | select CRYPTO_PCOMP2 |
98 | 103 | ||
99 | config CRYPTO_GF128MUL | 104 | config CRYPTO_GF128MUL |
100 | tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" | 105 | tristate "GF(2^128) multiplication functions (EXPERIMENTAL)" |