diff --git a/drivers/Kconfig b/drivers/Kconfig
new file mode 100644
index 000000000..d9c76e760
--- /dev/null
+++ b/drivers/Kconfig
@@ -0,0 +1,5 @@
+append_menu "Device Drivers"
+
+source "drivers/gpu/nvgpu/Kconfig"
+
+endmenu
diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
new file mode 100644
index 000000000..af71a62a0
--- /dev/null
+++ b/drivers/gpu/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_GK20A) += nvgpu/
diff --git a/drivers/gpu/nvgpu/Kconfig.nvgpu b/drivers/gpu/nvgpu/Kconfig
similarity index 98%
rename from drivers/gpu/nvgpu/Kconfig.nvgpu
rename to drivers/gpu/nvgpu/Kconfig
index 2a922ba27..4f90a35c7 100644
--- a/drivers/gpu/nvgpu/Kconfig.nvgpu
+++ b/drivers/gpu/nvgpu/Kconfig
@@ -136,5 +136,3 @@ config GK20A_VIDMEM
 	  Enable support for using and allocating buffers in a distinct video
 	  memory aperture (in contrast to general system memory), available on
 	  GPUs that have their own banks. PCIe GPUs have this, for example.
-
-trysource "../nvgpu-t19x/drivers/gpu/nvgpu/Kconfig"
diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile
similarity index 94%
rename from drivers/gpu/nvgpu/Makefile.nvgpu
rename to drivers/gpu/nvgpu/Makefile
index 1217fead6..af7a8af53 100644
--- a/drivers/gpu/nvgpu/Makefile.nvgpu
+++ b/drivers/gpu/nvgpu/Makefile
@@ -256,12 +256,3 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
 	vgpu/gp10b/vgpu_gr_gp10b.o  \
 	vgpu/gp10b/vgpu_mm_gp10b.o
 endif
-
-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