2 files changed, 5 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 99cd8731..dc404b7a 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -816,6 +816,7 @@ static const struct gpu_ops gv100_ops = {
                 .isr = gp10b_priv_ring_isr,
                 .decode_error_code = gp10b_priv_ring_decode_error_code,
         },
+#if defined(CONFIG_TEGRA_NVLINK)
         .nvlink = {
                 .discover_ioctrl = gv100_nvlink_discover_ioctrl,
                 .discover_link = gv100_nvlink_discover_link,
@@ -835,6 +836,7 @@ static const struct gpu_ops gv100_ops = {
                 .shutdown = gv100_nvlink_shutdown,
                 .early_init = gv100_nvlink_early_init,
         },
+#endif
         .chip_init_gpu_characteristics = gv100_init_gpu_characteristics,
         .get_litter_value = gv100_get_litter_value,
 };
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
index 776d1d66..9d99242f 100644
--- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c
@@ -20,6 +20,8 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef CONFIG_TEGRA_NVLINK
+
 #include <nvgpu/nvgpu_common.h>
 #include <nvgpu/bios.h>
 #include <nvgpu/firmware.h>
@@ -2677,3 +2679,4 @@ nvlink_init_exit:
         return err;
 }
 
+#endif /* CONFIG_TEGRA_NVLINK */