diff --git a/drivers/Makefile b/drivers/Makefile
index c6a16e1e..ad388da5 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -17,9 +17,7 @@ endif
 obj-m += c2c/
 obj-m += clink/
 obj-m += cpuidle/
-ifeq ($(CONFIG_SKIP_CRYPTO),)
 obj-m += crypto/
-endif
 ifdef CONFIG_PM_DEVFREQ
 obj-m += devfreq/
 endif
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index bf6b149c..f35a7a1d 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -5,7 +5,9 @@ ifdef CONFIG_TEGRA_HOST1X
 obj-m += tegra-hv-vse-safety.o
 obj-m += tegra-nvvse-cryptodev.o
 ifdef CONFIG_CRYPTO_ENGINE
+ifndef CONFIG_SKIP_CRYPTO
 obj-m += tegra/
 endif
 endif
+endif
 obj-m += tegra-se-nvrng.o