diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs
index e4686b3ef..adcc83994 100644
--- a/drivers/gpu/nvgpu/Makefile.linux.configs
+++ b/drivers/gpu/nvgpu/Makefile.linux.configs
@@ -94,9 +94,11 @@ CONFIG_TEGRA_GK20A_NVHOST := y
 CONFIG_TEGRA_GK20A_NVHOST_HOST1X := y
 endif
 
-ifneq ($(findstring 4.9,$(NV_BUILD_KERNEL_OPTIONS)),)
-CONFIG_NVGPU_NVMAP_NEXT := n
-else
+ifdef CONFIG_TEGRA_NVMAP_NEXT
+CONFIG_NVGPU_NVMAP_NEXT := y
+endif
+
+ifneq ($(findstring 5.10,$(NV_BUILD_KERNEL_OPTIONS)),)
 CONFIG_NVGPU_NVMAP_NEXT := y
 endif