diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-18 11:07:18 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-18 11:07:18 -0800 |
commit | fd3958eac387593d02e4d4287658ba04bcdb235a (patch) | |
tree | ed25f9c826f2c1841babf923f8431017aa073126 /drivers | |
parent | 19c329f6808995b142b3966301f217c831e7cf31 (diff) | |
parent | 382811940303f7cd01d0f3dcdf432dfd89c5a98e (diff) | |
download | linux-fd3958eac387593d02e4d4287658ba04bcdb235a.tar.bz2 |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"A Kconfig dependency issue with omap-sham and a divide by zero in xor
on some platforms"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: omap-sham - Fix link error without crypto-engine
crypto: xor - Fix divide error in do_xor_speed()
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/crypto/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index bbd51703e738..e535f28a8028 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -366,6 +366,7 @@ if CRYPTO_DEV_OMAP config CRYPTO_DEV_OMAP_SHAM tristate "Support for OMAP MD5/SHA1/SHA2 hw accelerator" depends on ARCH_OMAP2PLUS + select CRYPTO_ENGINE select CRYPTO_SHA1 select CRYPTO_MD5 select CRYPTO_SHA256 |