diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-27 23:16:41 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-27 23:16:41 -0400 |
| commit | 6d7e3d89954af773c70948a54cfa2aaa15907c1c (patch) | |
| tree | 6908f5e0e1af7294c00dc4e06ed583ef62f594df /drivers/crypto | |
| parent | d725332208ef13241fc435eece790c9d0ea16a4e (diff) | |
| parent | f858c7bcca8c20761a20593439fe998b4b67e86b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 0889e496d886..6b0579fdbbb2 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
| @@ -466,8 +466,9 @@ config CRYPTO_DEV_VMX | |||
| 466 | source "drivers/crypto/vmx/Kconfig" | 466 | source "drivers/crypto/vmx/Kconfig" |
| 467 | 467 | ||
| 468 | config CRYPTO_DEV_IMGTEC_HASH | 468 | config CRYPTO_DEV_IMGTEC_HASH |
| 469 | depends on MIPS || COMPILE_TEST | ||
| 470 | tristate "Imagination Technologies hardware hash accelerator" | 469 | tristate "Imagination Technologies hardware hash accelerator" |
| 470 | depends on MIPS || COMPILE_TEST | ||
| 471 | depends on HAS_DMA | ||
| 471 | select CRYPTO_ALGAPI | 472 | select CRYPTO_ALGAPI |
| 472 | select CRYPTO_MD5 | 473 | select CRYPTO_MD5 |
| 473 | select CRYPTO_SHA1 | 474 | select CRYPTO_SHA1 |