aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/Kconfig
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2005-11-05 02:06:26 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-09 17:15:39 -0500
commitc8a19c91b5b488fed8cce04200a84c6a35c0bf0c (patch)
treee0296c60f7601c5a1d1cf5fa9afd0e38f92e6995 /crypto/Kconfig
parent5cb1454b862ab3040b78364d58330262fea1ddba (diff)
[CRYPTO] Allow AES C/ASM implementations to coexist
As the Crypto API now allows multiple implementations to be registered for the same algorithm, we no longer have to play tricks with Kconfig to select the right AES implementation. This patch sets the driver name and priority for all the AES implementations and removes the Kconfig conditions on the C implementation for AES. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/Kconfig')
-rw-r--r--crypto/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 52e1d4108a99..c442f2e7ce46 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -157,7 +157,7 @@ config CRYPTO_SERPENT
157 157
158config CRYPTO_AES 158config CRYPTO_AES
159 tristate "AES cipher algorithms" 159 tristate "AES cipher algorithms"
160 depends on CRYPTO && !(X86 || UML_X86) 160 depends on CRYPTO
161 help 161 help
162 AES cipher algorithms (FIPS-197). AES uses the Rijndael 162 AES cipher algorithms (FIPS-197). AES uses the Rijndael
163 algorithm. 163 algorithm.