summaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-26 13:51:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-26 13:51:05 -0700
commitd89b3e19ef98a8d3b81a9f8a62c6ac89fd00412e (patch)
tree0cb5687b3b32f0e08e42ed8b4a9b55fffdf96c30 /drivers/crypto
parent78d425677217b655ed36c492a070b5002832fc73 (diff)
parent8c98ebd7a6ff6ef352bb4c5516a8849b40b5ef6b (diff)
downloadlinux-d89b3e19ef98a8d3b81a9f8a62c6ac89fd00412e.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This push fixes a build problem with img-hash under non-standard configurations and a serious regression with sha512_ssse3 which can lead to boot failures" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA crypto: x86/sha512_ssse3 - fixup for asm function prototype change
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 800bf41718e1..033c0c86f6ec 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -446,8 +446,9 @@ config CRYPTO_DEV_VMX
source "drivers/crypto/vmx/Kconfig"
config CRYPTO_DEV_IMGTEC_HASH
- depends on MIPS || COMPILE_TEST
tristate "Imagination Technologies hardware hash accelerator"
+ depends on MIPS || COMPILE_TEST
+ depends on HAS_DMA
select CRYPTO_ALGAPI
select CRYPTO_MD5
select CRYPTO_SHA1