From 7974ad17bb7f389e5634bde58a91304918097495 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 26 Oct 2017 12:49:50 -0700 Subject: gpu: nvgpu: Protect tegra_clk behind CCF flag clk_gk20a.h is used for dGPU and iGPU clocks. Because in gm20b the clocks are owned by nvgpu, it has references to Linux CCF. Protect the references behind #ifdef CONFIG_COMMON_CLK to compile it out on non-Linux platforms. JIRA NVGPU-259 Change-Id: I6ff095de7acaf1f828897cf3416acfaf050f8b51 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1586414 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Deepak Nibade GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/clk_gk20a.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h index 0280eb28..77a6669d 100644 --- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.h @@ -91,8 +91,8 @@ struct namemap_cfg; struct clk_gk20a { struct gk20a *g; - struct clk *tegra_clk; #if defined(CONFIG_COMMON_CLK) + struct clk *tegra_clk; struct clk_hw hw; #endif struct pll gpc_pll; -- cgit v1.2.2