diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile.nvgpu
similarity index 89%
rename from drivers/gpu/nvgpu/Makefile
rename to drivers/gpu/nvgpu/Makefile.nvgpu
index 1cf2ea379..e3c115c61 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile.nvgpu
@@ -122,10 +122,16 @@ ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
 ifneq ($(wildcard $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile),)
 include $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile
 endif
+ifneq ($(wildcard $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile.nvgpu-t18x),)
+include $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile.nvgpu-t18x
+endif
 endif
 
-ifeq ($(CONFIG_TEGRA_19x_GPU),y)
+ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)
 ifneq ($(wildcard $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile),)
 include $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile
 endif
+ifneq ($(wildcard $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile.nvgpu-t19x),)
+include $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile.nvgpu-t19x
+endif
 endif