From cbf22036fe17f610dfa4cefa06e272a70d01ea21 Mon Sep 17 00:00:00 2001 From: Sultan Alsawaf Date: Wed, 16 May 2018 19:57:56 -0700 Subject: [PATCH] crypto: Make CRYPTO_DEV_QCE depend on CRYPTO_DEV_QCRYPTO being disabled CRYPTO_DEV_QCE and CRYPTO_DEV_QCRYPTO both yield a qcrypto.o with matching platform device names, so one of them gets ignored by the platform device driver since it's redundant. CRYPTO_DEV_QCRYPTO's qcrypto.o is the up-to-date one, so it should take precedence and disable CRYPTO_DEV_QCE when it's built. Signed-off-by: Sultan Alsawaf Signed-off-by: UtsavBalar1231 --- drivers/crypto/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 113cd787ec7c..5169fa3dcf6b 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -579,7 +579,7 @@ config CRYPTO_DEV_CAVIUM_ZIP config CRYPTO_DEV_QCE tristate "Qualcomm crypto engine accelerator" - depends on (ARCH_QCOM || COMPILE_TEST) && HAS_DMA && HAS_IOMEM + depends on (ARCH_QCOM || COMPILE_TEST) && HAS_DMA && HAS_IOMEM && !CRYPTO_DEV_QCRYPTO select CRYPTO_AES select CRYPTO_DES select CRYPTO_ECB