1 files changed, 15 insertions, 3 deletions

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 87ec4d027c25..dffb85525368 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -276,6 +276,16 @@ config CRYPTO_DEV_PICOXCELL
 
           Saying m here will build a module named pipcoxcell_crypto.
 
+config CRYPTO_DEV_SAHARA
+        tristate "Support for SAHARA crypto accelerator"
+        depends on ARCH_MXC && EXPERIMENTAL && OF
+        select CRYPTO_BLKCIPHER
+        select CRYPTO_AES
+        select CRYPTO_ECB
+        help
+          This option enables support for the SAHARA HW crypto accelerator
+          found in some Freescale i.MX chips.
+
 config CRYPTO_DEV_S5P
         tristate "Support for Samsung S5PV210 crypto accelerator"
         depends on ARCH_S5PV210
@@ -361,15 +371,17 @@ config CRYPTO_DEV_ATMEL_TDES
           will be called atmel-tdes.
 
 config CRYPTO_DEV_ATMEL_SHA
-        tristate "Support for Atmel SHA1/SHA256 hw accelerator"
+        tristate "Support for Atmel SHA hw accelerator"
         depends on ARCH_AT91
         select CRYPTO_SHA1
         select CRYPTO_SHA256
+        select CRYPTO_SHA512
         select CRYPTO_ALGAPI
         help
-          Some Atmel processors have SHA1/SHA256 hw accelerator.
+          Some Atmel processors have SHA1/SHA224/SHA256/SHA384/SHA512
+          hw accelerator.
           Select this if you want to use the Atmel module for
-          SHA1/SHA256 algorithms.
+          SHA1/SHA224/SHA256/SHA384/SHA512 algorithms.
 
           To compile this driver as a module, choose M here: the module
           will be called atmel-sha.