1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index f6b3a673..df660eb7 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -8,9 +8,9 @@ ccflags-y += -Werror
 ccflags-y += -Wno-error=cpp
 
 ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include/uapi
+ccflags-y += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu
+ccflags-y += -I$(srctree)/../kernel-t18x/include
+ccflags-y += -I$(srctree)/../kernel-t18x/include/uapi
 endif
 
 obj-$(CONFIG_GK20A) := nvgpu.o
@@ -46,6 +46,8 @@ nvgpu-y := \
         gk20a/cde_gk20a.o \
         gk20a/platform_gk20a_generic.o \
         gk20a/tsg_gk20a.o \
+        gk20a/ctxsw_trace_gk20a.o \
+        gk20a/fecs_trace_gk20a.o \
         gk20a/mc_gk20a.o \
         gm20b/hal_gm20b.o \
         gm20b/ltc_gm20b.o \
@@ -64,7 +66,6 @@ nvgpu-y := \
         gm20b/debug_gm20b.o \
         gm20b/cde_gm20b.o \
         gm20b/therm_gm20b.o
-
 nvgpu-$(CONFIG_TEGRA_GK20A) += gk20a/platform_gk20a_tegra.o
 nvgpu-$(CONFIG_SYNC) += gk20a/sync_gk20a.o
 
@@ -78,6 +79,7 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
         vgpu/debug_vgpu.o \
         vgpu/vgpu.o \
         vgpu/dbg_vgpu.o \
+        vgpu/fecs_trace_vgpu.o \
         vgpu/gk20a/vgpu_hal_gk20a.o \
         vgpu/gk20a/vgpu_gr_gk20a.o \
         vgpu/gm20b/vgpu_hal_gm20b.o \
@@ -94,7 +96,5 @@ nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \
         gk20a/css_gr_gk20a.o
 
 ifeq ($(CONFIG_ARCH_TEGRA_18x_SOC),y)
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/drivers/gpu/nvgpu
-ccflags-$(CONFIG_GK20A) += -I$(srctree)/../kernel-t18x/include
-obj-$(CONFIG_GK20A)     += ../../../../kernel-t18x/drivers/gpu/nvgpu/
+include ../kernel-t18x/drivers/gpu/nvgpu/Makefile
 endif