summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/drivers/nouveau/nouveau_device.h (renamed from src/gallium/winsys/dri/nouveau/nouveau_device.h)0
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_context.h1
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_drmif.h2
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_screen.c1
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_screen.h1
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c1
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 e25e89fedd..e25e89fedd 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 b20107a94c..77e2147a2c 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 d5a0e25b57..a31c9a514b 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 f06e178483..9041275a88 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 e9da202690..388d6be9bb 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 849e38d22b..755c8b6997 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"