nouveau: make nouveau_device.h part of public API

6 files changed, 1 insertions, 5 deletions

diff --git a/src/gallium/winsys/dri/nouveau/nouveau_device.h b/src/gallium/drivers/nouveau/nouveau_device.h
index e25e89fedda..e25e89fedda 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_device.h
+++ b/src/gallium/drivers/nouveau/nouveau_device.h
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_context.h b/src/gallium/winsys/dri/nouveau/nouveau_context.h
index b20107a94c6..77e2147a2c7 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_context.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_context.h
@@ -5,7 +5,6 @@
 #include "xmlconfig.h"
 
 #include "nouveau/nouveau_winsys.h"
-#include "nouveau_device.h"
 #include "nouveau_drmif.h"
 #include "nouveau_dma.h"
 
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_drmif.h b/src/gallium/winsys/dri/nouveau/nouveau_drmif.h
index d5a0e25b573..a31c9a514b1 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_drmif.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_drmif.h
@@ -27,7 +27,7 @@
 #include <xf86drm.h>
 #include <nouveau_drm.h>
 
-#include "nouveau_device.h"
+#include "nouveau/nouveau_device.h"
 #include "nouveau/nouveau_channel.h"
 #include "nouveau/nouveau_grobj.h"
 #include "nouveau/nouveau_notifier.h"
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_screen.c b/src/gallium/winsys/dri/nouveau/nouveau_screen.c
index f06e1784831..9041275a88f 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_screen.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_screen.c
@@ -7,7 +7,6 @@
 #include "state_tracker/st_cb_fbo.h"
 
 #include "nouveau_context.h"
-#include "nouveau_device.h"
 #include "nouveau_drm.h"
 #include "nouveau_dri.h"
 #include "nouveau_local.h"
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_screen.h b/src/gallium/winsys/dri/nouveau/nouveau_screen.h
index e9da2026904..388d6be9bbc 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_screen.h
+++ b/src/gallium/winsys/dri/nouveau/nouveau_screen.h
@@ -2,7 +2,6 @@
 #define __NOUVEAU_SCREEN_H__
 
 #include "xmlconfig.h"
-#include "nouveau_device.h"
 
 struct nouveau_screen {
 	__DRIscreenPrivate *driScrnPriv;
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c
index 849e38d22b6..755c8b6997a 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c
@@ -4,7 +4,6 @@
 #include "pipe/p_inlines.h"
 
 #include "nouveau_context.h"
-#include "nouveau_device.h"
 #include "nouveau_local.h"
 #include "nouveau_screen.h"
 #include "nouveau_swapbuffers.h"