Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab...

[karo-tx-linux.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 07d494276aad04195c9e7247089649b302d3082c..477fffdb4f491170a1debb7b4fa6efe10d4a9553 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -296,6 +296,7 @@ config CRYPTO_DEV_OMAP_AES
        depends on ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP2PLUS
        select CRYPTO_AES
        select CRYPTO_BLKCIPHER
+       select CRYPTO_ENGINE
        help
          OMAP processors have AES module accelerator. Select this if you
          want to use the OMAP module for AES algorithms.
@@ -487,7 +488,7 @@ config CRYPTO_DEV_IMGTEC_HASH
 
 config CRYPTO_DEV_SUN4I_SS
        tristate "Support for Allwinner Security System cryptographic accelerator"
-       depends on ARCH_SUNXI
+       depends on ARCH_SUNXI && !64BIT
        select CRYPTO_MD5
        select CRYPTO_SHA1
        select CRYPTO_AES
@@ -507,6 +508,10 @@ config CRYPTO_DEV_ROCKCHIP
        depends on OF && ARCH_ROCKCHIP
        select CRYPTO_AES
        select CRYPTO_DES
+       select CRYPTO_MD5
+       select CRYPTO_SHA1
+       select CRYPTO_SHA256
+       select CRYPTO_HASH
        select CRYPTO_BLKCIPHER
 
        help