From d12271255e0d1f13b46ee316f9c39baf25cbc027 Mon Sep 17 00:00:00 2001
From: Shanker Donthineni <sdonthineni@nvidia.com>
Date: Tue, 4 Oct 2022 11:29:10 -0500
Subject: [PATCH] nvidia-oot: disable offending drivers for v6.0

Some of the drivers from nvidia-oot are not compatible with v6.0
kernel API and data structure. Disable those drivers to unblock
the kstable-v6.0 release.

Revert this patch after fixing build issues with v6.0 kernel.

Bug 3767126

Signed-off-by: Shanker Donthineni <sdonthineni@nvidia.com>
Change-Id: I6b1499c8e92213a3722c506cfbad66f724b6f14c
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2786883
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 Makefile             | 2 ++
 drivers/Makefile     | 4 ++++
 drivers/net/Makefile | 2 ++
 3 files changed, 8 insertions(+)

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