diff --git a/Makefile b/Makefile
index c8af276a..04ec43b4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,4 +2,6 @@
 # Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
 
 obj-m += drivers/
+ifeq ($(shell test $$VERSION -lt 6; echo $$?),0)
 obj-m += sound/soc/tegra/
+endif
diff --git a/drivers/Makefile b/drivers/Makefile
index f12a1820..cd5be507 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -3,7 +3,9 @@
 
 LINUXINCLUDE += -I$(srctree.nvidia-oot)/include
 
+ifeq ($(shell test $$VERSION -lt 6; echo $$?),0)
 obj-m += block/tegra_virt_storage/
+endif
 obj-m += crypto/
 obj-m += devfreq/
 obj-m += dma/
@@ -29,5 +31,7 @@ obj-m += thermal/
 obj-m += watchdog/
 obj-m += video/tegra/
 obj-m += virt/tegra/
+ifeq ($(shell test $$VERSION -lt 6; echo $$?),0)
 obj-m += media/
+endif
 
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f9899296..131e19d4 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -3,4 +3,6 @@
 
 obj-m += ethernet/
 obj-m += tegra_hv_net.o
+ifeq ($(shell test $$VERSION -lt 6; echo $$?),0)
 obj-m += can/
+endif