From 0c45c5fcb60810f06b0ae05270f0fa7e32d31869 Mon Sep 17 00:00:00 2001
From: Konsta Holtta <kholtta@nvidia.com>
Date: Fri, 24 Mar 2017 14:24:05 +0200
Subject: gpu: nvgpu: delete unused #includes missing in 4.9

Drop old unnecessary references to clock and edp. These headers are not
in kernel-4.9 (yet?). Add proper #ifdefs for #including soctherm.

Bug 1853519

Change-Id: I28e829f78df356e5efcffd9bd985fd736e76d2c0
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1327659
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c | 3 ++-
 drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'drivers/gpu/nvgpu/tegra')

diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
index 636495a8..32086aff 100644
--- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
@@ -26,8 +26,9 @@
 #include <linux/dma-attrs.h>
 #include <linux/nvmap.h>
 #include <linux/reset.h>
+#if defined(CONFIG_TEGRA_CLK_FRAMEWORK) || defined(CONFIG_TEGRA_DVFS)
 #include <linux/tegra_soctherm.h>
-#include <linux/platform/tegra/clock.h>
+#endif
 #if defined(CONFIG_TEGRA_CLK_FRAMEWORK)
 #include <linux/platform/tegra/dvfs.h>
 #endif
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
index e499627f..6351e895 100644
--- a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
@@ -16,7 +16,6 @@
 #include <linux/of_platform.h>
 #include <linux/nvhost.h>
 #include <linux/debugfs.h>
-#include <linux/platform_data/tegra_edp.h>
 #include <linux/dma-buf.h>
 #include <linux/nvmap.h>
 #include <linux/reset.h>
-- 
cgit v1.2.2