Commit 139abbf5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 36be5051 1ebfefcf

drivers/crypto/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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