diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2017-03-24 08:24:05 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-03-27 07:45:36 -0400 |
commit | 0c45c5fcb60810f06b0ae05270f0fa7e32d31869 (patch) | |
tree | b3c91410cb0ae2a487989a87bcd6451f838fe7f5 /drivers | |
parent | 0f2eb5430d19cc49661d69571dde042650766691 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a_scale.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c index b9e92f15..bae5c2d8 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/export.h> | 22 | #include <linux/export.h> |
23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
24 | #include <soc/tegra/chip-id.h> | 24 | #include <soc/tegra/chip-id.h> |
25 | #include <linux/platform_data/tegra_edp.h> | ||
26 | #include <linux/pm_qos.h> | 25 | #include <linux/pm_qos.h> |
27 | 26 | ||
28 | #include <governor.h> | 27 | #include <governor.h> |
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 @@ | |||
26 | #include <linux/dma-attrs.h> | 26 | #include <linux/dma-attrs.h> |
27 | #include <linux/nvmap.h> | 27 | #include <linux/nvmap.h> |
28 | #include <linux/reset.h> | 28 | #include <linux/reset.h> |
29 | #if defined(CONFIG_TEGRA_CLK_FRAMEWORK) || defined(CONFIG_TEGRA_DVFS) | ||
29 | #include <linux/tegra_soctherm.h> | 30 | #include <linux/tegra_soctherm.h> |
30 | #include <linux/platform/tegra/clock.h> | 31 | #endif |
31 | #if defined(CONFIG_TEGRA_CLK_FRAMEWORK) | 32 | #if defined(CONFIG_TEGRA_CLK_FRAMEWORK) |
32 | #include <linux/platform/tegra/dvfs.h> | 33 | #include <linux/platform/tegra/dvfs.h> |
33 | #endif | 34 | #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 @@ | |||
16 | #include <linux/of_platform.h> | 16 | #include <linux/of_platform.h> |
17 | #include <linux/nvhost.h> | 17 | #include <linux/nvhost.h> |
18 | #include <linux/debugfs.h> | 18 | #include <linux/debugfs.h> |
19 | #include <linux/platform_data/tegra_edp.h> | ||
20 | #include <linux/dma-buf.h> | 19 | #include <linux/dma-buf.h> |
21 | #include <linux/nvmap.h> | 20 | #include <linux/nvmap.h> |
22 | #include <linux/reset.h> | 21 | #include <linux/reset.h> |