diff --git a/drivers/gpu/host1x/Makefile.nvidia b/drivers/gpu/host1x/Makefile
similarity index 71%
rename from drivers/gpu/host1x/Makefile.nvidia
rename to drivers/gpu/host1x/Makefile
index 00744ed9..0d61d12a 100644
--- a/drivers/gpu/host1x/Makefile.nvidia
+++ b/drivers/gpu/host1x/Makefile
@@ -5,4 +5,4 @@ host1x-t186-y = \
 	dev_t186.o \
 	hw/host1x05.o
 
-obj-$(CONFIG_TEGRA_HOST1X) += host1x-t186.o
+obj-$(CONFIG_ARCH_TEGRA_18x_SOC) += host1x-t186.o