Merge remote-tracking branch 'mips/mips-for-linux-next'

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

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index d234719065a5f2e39c3e81681dc0bd184e803033..2569e043317e14c70eee11617622fe3dfe5a7846 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -420,7 +420,7 @@ config CRYPTO_DEV_CCP
        bool "Support for AMD Cryptographic Coprocessor"
        depends on ((X86 && PCI) || (ARM64 && (OF_ADDRESS || ACPI))) && HAS_IOMEM
        help
-         The AMD Cryptographic Coprocessor provides hardware support
+         The AMD Cryptographic Coprocessor provides hardware offload support
          for encryption, hashing and related operations.
 
 if CRYPTO_DEV_CCP
@@ -429,7 +429,8 @@ endif
 
 config CRYPTO_DEV_MXS_DCP
        tristate "Support for Freescale MXS DCP"
-       depends on ARCH_MXS
+       depends on (ARCH_MXS || ARCH_MXC)
+       select STMP_DEVICE
        select CRYPTO_CBC
        select CRYPTO_ECB
        select CRYPTO_AES