diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-06-19 17:35:48 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-20 22:14:15 -0400 |
commit | ca76b41a642209418562c1899fdb1f0b1af4b889 (patch) | |
tree | 9c51395809023ecf59e2c9dce82c9083b6f24164 /drivers/gpu | |
parent | 492c7cc198f3315b468fa3d612d894edf2bb5e89 (diff) |
gpu: nvgpu: gv11b: Merge tegra/linux to common/linux
tegra/linux path was created to separate Tegra kernel specific
dependencies from common Linux specific dependencies. The split has
not really worked, so merge tegra/linux to common/linux.
JIRA NVGPU-38
Change-Id: I9efe078bfa5dfbef49408db9d8a3738dfda8bd1d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1505169
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c index 2b6f8759..fee4ebbf 100644 --- a/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c +++ b/drivers/gpu/nvgpu/gv11b/platform_gv11b_tegra.c | |||
@@ -26,12 +26,12 @@ | |||
26 | 26 | ||
27 | #include "gk20a/platform_gk20a.h" | 27 | #include "gk20a/platform_gk20a.h" |
28 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
29 | #include "tegra/linux/clk.h" | 29 | #include "common/linux/clk.h" |
30 | 30 | ||
31 | #include "gp10b/platform_gp10b.h" | 31 | #include "gp10b/platform_gp10b.h" |
32 | #include "tegra/linux/platform_gp10b_tegra.h" | 32 | #include "common/linux/platform_gp10b_tegra.h" |
33 | 33 | ||
34 | #include "tegra/linux/platform_gk20a_tegra.h" | 34 | #include "common/linux/platform_gk20a_tegra.h" |
35 | #include "gr_gv11b.h" | 35 | #include "gr_gv11b.h" |
36 | #include "nvgpu_gpuid_t19x.h" | 36 | #include "nvgpu_gpuid_t19x.h" |
37 | 37 | ||