From c1ca73ca3417c7ecc7fb5916e1b9002ffd705aa6 Mon Sep 17 00:00:00 2001 From: Peter Boonstoppel Date: Tue, 25 Oct 2016 14:31:24 -0700 Subject: gpu: nvgpu: Compile clk_gm20b.c for Common Clock Framework Bug 200233943 Change-Id: I80c859e96ae12057fae70d56f93a0b4878e5225b Signed-off-by: Peter Boonstoppel Reviewed-on: http://git-master/r/1242482 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/Makefile.nvgpu | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/Makefile.nvgpu') diff --git a/drivers/gpu/nvgpu/Makefile.nvgpu b/drivers/gpu/nvgpu/Makefile.nvgpu index f587a930..96cdfb0a 100644 --- a/drivers/gpu/nvgpu/Makefile.nvgpu +++ b/drivers/gpu/nvgpu/Makefile.nvgpu @@ -117,10 +117,12 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ vgpu/gm20b/vgpu_hal_gm20b.o \ vgpu/gm20b/vgpu_gr_gm20b.o -nvgpu-$(CONFIG_TEGRA_CLK_FRAMEWORK) += \ - gm20b/clk_gm20b.o \ - gk20a/clk_gk20a.o \ - clk/clk_common.o +nvgpu-$(CONFIG_TEGRA_CLK_FRAMEWORK) += gk20a/clk_gk20a.o +ifneq (,$filter y,$(CONFIG_TEGRA_CLK_FRAMEWORK),$(CONFIG_COMMON_CLK)) +nvgpu-y += \ + clk/clk_common.o \ + gm20b/clk_gm20b.o +endif nvgpu-$(CONFIG_GK20A_DEVFREQ) += \ gk20a/gk20a_scale.o -- cgit v1.2.2