Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mv-sheeva.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ea0b3863ad0fbd8afde0d4f5631081163222a26d..eab2cf7a02690b2a4a3d61cdeb3c0e604249b15e 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -172,6 +172,7 @@ config CRYPTO_DEV_MV_CESA
 
 config CRYPTO_DEV_NIAGARA2
        tristate "Niagara2 Stream Processing Unit driver"
+       select CRYPTO_DES
        select CRYPTO_ALGAPI
        depends on SPARC64
        help
@@ -243,4 +244,12 @@ config CRYPTO_DEV_OMAP_SHAM
          OMAP processors have SHA1/MD5 hw accelerator. Select this if you
          want to use the OMAP module for SHA1/MD5 algorithms.
 
+config CRYPTO_DEV_OMAP_AES
+       tristate "Support for OMAP AES hw engine"
+       depends on ARCH_OMAP2 || ARCH_OMAP3
+       select CRYPTO_AES
+       help
+         OMAP processors have AES module accelerator. Select this if you
+         want to use the OMAP module for AES algorithms.
+
 endif # CRYPTO_HW