aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-11-27 06:48:27 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2008-01-10 16:16:41 -0500
commit653ebd9c8510a7d647ed23e66e1338f848ebdbab (patch)
tree99e1d59a0a944807bf10b59f874045ac8067ba68 /drivers/crypto
parent2589469d7bc69bdfad4e05d88a0d2748f92ef0f3 (diff)
[CRYPTO] blkcipher: Merge ablkcipher and blkcipher into one option/module
With the impending addition of the givcipher type, both blkcipher and ablkcipher algorithms will use it to create givcipher objects. As such it no longer makes sense to split the system between ablkcipher and blkcipher. In particular, both ablkcipher.c and blkcipher.c would need to use the givcipher type which has to reside in ablkcipher.c since it shares much code with it. This patch merges the two Kconfig options as well as the modules into one. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index d848e1b1624b..d8c70403b9da 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -87,7 +87,7 @@ config CRYPTO_DEV_HIFN_795X
87 tristate "Driver HIFN 795x crypto accelerator chips" 87 tristate "Driver HIFN 795x crypto accelerator chips"
88 select CRYPTO_DES 88 select CRYPTO_DES
89 select CRYPTO_ALGAPI 89 select CRYPTO_ALGAPI
90 select CRYPTO_ABLKCIPHER 90 select CRYPTO_BLKCIPHER
91 depends on PCI 91 depends on PCI
92 help 92 help
93 This option allows you to have support for HIFN 795x crypto adapters. 93 This option allows you to have support for HIFN 795x crypto adapters.