diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 13a35f76d..b0bb4176e 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -16,7 +16,7 @@ ccflags-y += -I$(srctree)/../nvgpu-t18x/include
 ccflags-y += -I$(srctree)/../nvgpu-t18x/include/uapi
 endif
 
-ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)
+ifeq ($(CONFIG_TEGRA_19x_GPU),y)
 ccflags-y += -I$(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu
 ccflags-y += -I$(srctree)/../nvgpu-t19x/include
 ccflags-y += -I$(srctree)/../nvgpu-t19x/include/uapi
@@ -117,7 +117,7 @@ include $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)
+ifeq ($(CONFIG_TEGRA_19x_GPU),y)
 ifneq ($(wildcard $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile),)
 include $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile
 endif
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 8b4c45498..03173339b 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -94,7 +94,7 @@ struct nvgpu_gpu_zbc_query_table_args {
 #include <linux/nvgpu-t18x.h>
 #endif
 
-#ifdef CONFIG_ARCH_TEGRA_19x_SOC
+#ifdef CONFIG_TEGRA_19x_GPU
 #include <linux/nvgpu-t19x.h>
 #endif