summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-16 15:44:34 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-16 15:44:34 +0200
commit139abbf5ef977fe7cf638f4c4d0f03cc74ad8180 (patch)
tree7d93a9193fae86c8a456f0870c154a60fc70ccfb
parent36be50515fe2aef61533b516fa2576a2c7fe7664 (diff)
parent1ebfefcf37a6e308266a8d786e8cfea0a454058c (diff)
Merge branch 'marvell_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux into fixes
* 'marvell_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux: crypto: mv_cesa requires on CRYPTO_HASH to build Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--drivers/crypto/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ab9abb46d01..dd414d9350e 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -164,6 +164,7 @@ config CRYPTO_DEV_MV_CESA
select CRYPTO_ALGAPI
select CRYPTO_AES
select CRYPTO_BLKCIPHER2
+ select CRYPTO_HASH
help
This driver allows you to utilize the Cryptographic Engines and
Security Accelerator (CESA) which can be found on the Marvell Orion