From: Hariprasad Kelam <hariprasad.kelam@gmail.com>
Date: Sun, 26 May 2019 11:06:25 +0000 (+0530)
Subject: drm/nouveau: fix nvif/device.h is included more than once
X-Git-Tag: v5.4-rc1~32^2~14^2~30
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eb3f4cfa53bca7c17feefa926a365e80844198d6;p=tomoyo%2Ftomoyo-test1.git

drm/nouveau: fix nvif/device.h is included more than once

remove duplicate inclusion of nvif/device.h

Issue identified by includecheck

Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 62e01919bb5f..cf0d0a416af6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -130,7 +130,6 @@ nouveau_cli(struct drm_file *fpriv)
 }
 
 #include <nvif/object.h>
-#include <nvif/device.h>
 
 struct nouveau_drm {
 	struct nouveau_cli master;