diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-06-08 03:25:51 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-12 14:03:37 -0400 |
commit | 9cb4cc5d07e8a894f7d0c3ea5ea932291df32c36 (patch) | |
tree | a076ae6e1aff4c7ad621bb578dfa4c27f1f77b52 /drivers/gpu/nvgpu/common | |
parent | 002d6f147490cd5b3002ce5a564f4276df784ea6 (diff) |
gpu: nvgpu: remove duplicate nvhost_priv_t19x.h
We added duplicate common/linux/nvhost_priv_t19x.h so that the definition of
struct nvgpu_nvhost_dev is available in nvgpu-t19x repo
But instead of duplicating the file, directly include original file with
path #include "common/linux/nvhost_priv.h
Jira NVGPU-29
Change-Id: I5d373227f0f6b2b4670d2fd3ad433a4655df8e4f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1499167
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/nvhost_priv_t19x.h | 29 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/nvhost_t19x.c | 2 |
2 files changed, 1 insertions, 30 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost_priv_t19x.h b/drivers/gpu/nvgpu/common/linux/nvhost_priv_t19x.h deleted file mode 100644 index 7ff6184d..00000000 --- a/drivers/gpu/nvgpu/common/linux/nvhost_priv_t19x.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | |||
17 | #ifndef __NVGPU_NVHOST_PRIV_T19X_H__ | ||
18 | #define __NVGPU_NVHOST_PRIV_T19X_H__ | ||
19 | |||
20 | /* | ||
21 | * This file is copy of common/linux/nvhost_priv.h in nvgpu repo | ||
22 | * This file should be removed when nvgpu-t19x repo is merged | ||
23 | * into common nvgpu repo | ||
24 | */ | ||
25 | struct nvgpu_nvhost_dev { | ||
26 | struct platform_device *host1x_pdev; | ||
27 | }; | ||
28 | |||
29 | #endif /* __NVGPU_NVHOST_PRIV_T19X_H__ */ | ||
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost_t19x.c b/drivers/gpu/nvgpu/common/linux/nvhost_t19x.c index 0bbb3d72..0b2ae08c 100644 --- a/drivers/gpu/nvgpu/common/linux/nvhost_t19x.c +++ b/drivers/gpu/nvgpu/common/linux/nvhost_t19x.c | |||
@@ -19,7 +19,7 @@ | |||
19 | 19 | ||
20 | #include <nvgpu/nvhost_t19x.h> | 20 | #include <nvgpu/nvhost_t19x.h> |
21 | 21 | ||
22 | #include "nvhost_priv_t19x.h" | 22 | #include "common/linux/nvhost_priv.h" |
23 | 23 | ||
24 | int nvgpu_nvhost_syncpt_unit_interface_get_aperture( | 24 | int nvgpu_nvhost_syncpt_unit_interface_get_aperture( |
25 | struct nvgpu_nvhost_dev *nvhost_dev, | 25 | struct nvgpu_nvhost_dev *nvhost_dev, |