diff --git a/Makefile b/Makefile
index 91e368e8..acfe092e 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,9 @@ subdir-ccflags-y += -DNV_UNEXPORT_FD_HANDLE_CONVERSION
 
 # FB Deferred IO helpers name alignment
 subdir-ccflags-y += -DNV_FB_DEFERRED_IO_OPS_RENAME
+
+# Crypto driver has major change in it ops, skip it
+export CONFIG_SKIP_CRYPTO=y
 endif
 
 ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
diff --git a/drivers/Makefile b/drivers/Makefile
index ad388da5..c6a16e1e 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -17,7 +17,9 @@ 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