diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 32b18ba328eb..3f712e9d1604 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -557,7 +557,7 @@ config CRYPTO_DEV_SUN4I_SS
 	  will be called sun4i-ss.
 
 if ARCH_QCOM
-source "drivers/crypto/msm/Kconfig"
+source drivers/crypto/msm/Kconfig
 endif # ARCH_QCOM
 
 
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index a4c74902655c..b1151f72dbbf 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -27,7 +27,6 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
 obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
 obj-$(CONFIG_CRYPTO_DEV_QAT) += qat/
 obj-$(CONFIG_CRYPTO_DEV_QCE) += qce/
-obj-$(CONFIG_CRYPTO_DEV_QCOM_MSM_QCE) += msm/
 obj-$(CONFIG_CRYPTO_DEV_VMX) += vmx/
 obj-$(CONFIG_CRYPTO_DEV_SUN4I_SS) += sunxi-ss/
 obj-$(CONFIG_ARCH_QCOM) += msm/
diff --git a/drivers/crypto/msm/Kconfig b/drivers/crypto/msm/Kconfig
index b5a85c2732a7..0f4568b46468 100644
--- a/drivers/crypto/msm/Kconfig
+++ b/drivers/crypto/msm/Kconfig
@@ -1,9 +1,10 @@
-
-config CRYPTO_DEV_QCOM_ICE
-	tristate "Inline Crypto Module"
-	default n
-	help
-	  This driver supports Inline Crypto Engine for QTI chipsets, MSM8994
-	  and later, to accelerate crypto operations for storage needs.
-	  To compile this driver as a module, choose M here: the
-	  module will be called ice.
+
+config CRYPTO_DEV_QCOM_ICE
+	tristate "Inline Crypto Module"
+	default n
+	depends on PFK && BLK_DEV_DM
+	help
+	  This driver supports Inline Crypto Engine for QTI chipsets, MSM8994
+	  and later, to accelerate crypto operations for storage needs.
+	  To compile this driver as a module, choose M here: the
+	  module will be called ice.