From 3531866677d1fbb854bf2b1ee860b6fc0e468df3 Mon Sep 17 00:00:00 2001
From: Terje Bergstrom <tbergstrom@nvidia.com>
Date: Mon, 6 Jul 2020 12:36:26 -0700
Subject: [PATCH] gpu: nvgpu: Include linux/platform/tegra/common.h only in
 downstream

linux/platform/tegra/common.h is a Tegra downstream kernel specific
header file. #include it only if downstream fuse or VPR support exists.

Bug 3030537

Change-Id: Ia6b9bc94aca64afdb7d4d44f8a49befc2a3de4e0
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2371380
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/os/linux/module.c               | 2 ++
 drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index b1e136259..b95b47f69 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -26,7 +26,9 @@
 #include <linux/reset.h>
 #include <linux/reboot.h>
 #include <linux/notifier.h>
+#ifdef CONFIG_NVGPU_VPR
 #include <linux/platform/tegra/common.h>
+#endif
 #include <linux/pci.h>
 #include <linux/of_gpio.h>
 
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
index b58ae4c8a..ad75ec5a7 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
@@ -24,7 +24,9 @@
 #if defined(CONFIG_TEGRA_DVFS)
 #include <linux/tegra_soctherm.h>
 #endif
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 #include <linux/platform/tegra/common.h>
+#endif
 
 #ifdef CONFIG_NV_TEGRA_MC
 #include <linux/platform/tegra/mc.h>