Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 6b658d84d521c4d8aed4e3a86fcd3efb0be057c5..cb34a72b8902a93a45b4f7fb8a8b7eb8010b8c9a 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -81,6 +81,13 @@ config ZCRYPT_MONOLITHIC
          that contains all parts of the crypto device driver (ap bus,
          request router and all the card drivers).
 
+config OMAP_SHA1_MD5
+       tristate "Support for OMAP SHA1/MD5 hw engine"
+       depends on ARCH_OMAP24XX && CRYPTO_SHA1 && CRYPTO_MD5
+       help
+         OMAP processors have SHA1/MD5 module accelerator. Select this if you
+         want to use the OMAP module for SHA1/MD5 algorithms.
+
 config CRYPTO_SHA1_S390
        tristate "SHA1 digest algorithm"
        depends on S390