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>

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 @@
-/*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __NVGPU_NVHOST_PRIV_T19X_H__
-#define __NVGPU_NVHOST_PRIV_T19X_H__
-
-/*
- * This file is copy of common/linux/nvhost_priv.h in nvgpu repo
- * This file should be removed when nvgpu-t19x repo is merged
- * into common nvgpu repo
- */
-struct nvgpu_nvhost_dev {
-        struct platform_device *host1x_pdev;
-};
-
-#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 @@
 
 #include <nvgpu/nvhost_t19x.h>
 
-#include "nvhost_priv_t19x.h"
+#include "common/linux/nvhost_priv.h"
 
 int nvgpu_nvhost_syncpt_unit_interface_get_aperture(
                 struct nvgpu_nvhost_dev *nvhost_dev,