Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[~andy/linux] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 1092a770482e53ce8597b39c9bba9dfa647db572..7d74d092aa8fe1bac90c6ccd8652099d138b6e2e 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -298,7 +298,7 @@ config CRYPTO_DEV_TEGRA_AES
          will be called tegra-aes.
 
 config CRYPTO_DEV_NX
-       tristate "Support for Power7+ in-Nest cryptographic accleration"
+       tristate "Support for Power7+ in-Nest cryptographic acceleration"
        depends on PPC64 && IBMVIO
        select CRYPTO_AES
        select CRYPTO_CBC
@@ -325,4 +325,58 @@ if CRYPTO_DEV_UX500
        source "drivers/crypto/ux500/Kconfig"
 endif # if CRYPTO_DEV_UX500
 
+config CRYPTO_DEV_BFIN_CRC
+       tristate "Support for Blackfin CRC hardware"
+       depends on BF60x
+       help
+         Newer Blackfin processors have CRC hardware. Select this if you
+         want to use the Blackfin CRC module.
+
+config CRYPTO_DEV_ATMEL_AES
+       tristate "Support for Atmel AES hw accelerator"
+       depends on ARCH_AT91
+       select CRYPTO_CBC
+       select CRYPTO_ECB
+       select CRYPTO_AES
+       select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
+       select CONFIG_AT_HDMAC
+       help
+         Some Atmel processors have AES hw accelerator.
+         Select this if you want to use the Atmel module for
+         AES algorithms.
+
+         To compile this driver as a module, choose M here: the module
+         will be called atmel-aes.
+
+config CRYPTO_DEV_ATMEL_TDES
+       tristate "Support for Atmel DES/TDES hw accelerator"
+       depends on ARCH_AT91
+       select CRYPTO_DES
+       select CRYPTO_CBC
+       select CRYPTO_ECB
+       select CRYPTO_ALGAPI
+       select CRYPTO_BLKCIPHER
+       help
+         Some Atmel processors have DES/TDES hw accelerator.
+         Select this if you want to use the Atmel module for
+         DES/TDES algorithms.
+
+         To compile this driver as a module, choose M here: the module
+         will be called atmel-tdes.
+
+config CRYPTO_DEV_ATMEL_SHA
+       tristate "Support for Atmel SHA1/SHA256 hw accelerator"
+       depends on ARCH_AT91
+       select CRYPTO_SHA1
+       select CRYPTO_SHA256
+       select CRYPTO_ALGAPI
+       help
+         Some Atmel processors have SHA1/SHA256 hw accelerator.
+         Select this if you want to use the Atmel module for
+         SHA1/SHA256 algorithms.
+
+         To compile this driver as a module, choose M here: the module
+         will be called atmel-sha.
+
 endif # CRYPTO_HW