diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 2e40a675f..a3bbe0344 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -71,7 +71,7 @@
 #include "nvgpu_gpuid_t18x.h"
 #endif
 
-#ifdef CONFIG_ARCH_TEGRA_19x_SOC
+#ifdef CONFIG_TEGRA_19x_GPU
 #include "nvgpu_gpuid_t19x.h"
 #endif
 
@@ -933,7 +933,7 @@ static struct of_device_id tegra_gk20a_of_match[] = {
 	{ .compatible = TEGRA_18x_GPU_COMPAT_TEGRA,
 		.data = &t18x_gpu_tegra_platform },
 #endif
-#ifdef CONFIG_ARCH_TEGRA_19x_SOC
+#ifdef CONFIG_TEGRA_19x_GPU
 	{ .compatible = TEGRA_19x_GPU_COMPAT_TEGRA,
 		.data = &t19x_gpu_tegra_platform },
 #endif
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c
index 52ec108b7..7ab4153bd 100644
--- a/drivers/gpu/nvgpu/gk20a/hal.c
+++ b/drivers/gpu/nvgpu/gk20a/hal.c
@@ -22,7 +22,7 @@
 #include "nvgpu_gpuid_t18x.h"
 #endif
 
-#ifdef CONFIG_ARCH_TEGRA_19x_SOC
+#ifdef CONFIG_TEGRA_19x_GPU
 #include "nvgpu_gpuid_t19x.h"
 #endif
 
@@ -55,7 +55,7 @@ int gpu_init_hal(struct gk20a *g)
 			return -ENODEV;
 		break;
 #endif
-#if defined(CONFIG_ARCH_TEGRA_19x_SOC)
+#ifdef CONFIG_TEGRA_19x_GPU
 	case TEGRA_19x_GPUID:
 		if (TEGRA_19x_GPUID_HAL(g))
 			return -ENODEV;