summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gray <[email protected]>2014-03-20 14:43:29 +1100
committerIlia Mirkin <[email protected]>2014-03-20 08:32:12 -0400
commit8044fd6769d51ae35402cd62272ea8582b625445 (patch)
tree833a5fb9e349adc3156f85f3b1aeefe6d26bf6be
parent8fbc9d9b6f09b3098a5f34340cce092aa46c42ad (diff)
nouveau: don't assume libdrm include prefix
drm headers may be installed in a different directory Signed-off-by: Jonathan Gray <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]>
-rw-r--r--src/gallium/drivers/nouveau/nouveau_context.h2
-rw-r--r--src/gallium/drivers/nouveau/nouveau_screen.c2
-rw-r--r--src/gallium/drivers/nouveau/nouveau_vp3_video.h2
-rw-r--r--src/gallium/drivers/nouveau/nouveau_winsys.h2
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_driver.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_context.h b/src/gallium/drivers/nouveau/nouveau_context.h
index bad5ab7319b..c8d9d841d6e 100644
--- a/src/gallium/drivers/nouveau/nouveau_context.h
+++ b/src/gallium/drivers/nouveau/nouveau_context.h
@@ -2,7 +2,7 @@
#define __NOUVEAU_CONTEXT_H__
#include "pipe/p_context.h"
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
#define NOUVEAU_MAX_SCRATCH_BUFS 4
diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index 19892b17c6c..9d71bf77dd4 100644
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -14,7 +14,7 @@
#include <errno.h>
#include <stdlib.h>
-#include <libdrm/nouveau_drm.h>
+#include <nouveau_drm.h>
#include "nouveau_winsys.h"
#include "nouveau_screen.h"
diff --git a/src/gallium/drivers/nouveau/nouveau_vp3_video.h b/src/gallium/drivers/nouveau/nouveau_vp3_video.h
index 0193ed02ddb..88c14ec60ff 100644
--- a/src/gallium/drivers/nouveau/nouveau_vp3_video.h
+++ b/src/gallium/drivers/nouveau/nouveau_vp3_video.h
@@ -20,7 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
#include "pipe/p_defines.h"
#include "vl/vl_video_buffer.h"
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index 9993ed6ee72..51effb1d8d2 100644
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -6,7 +6,7 @@
#include "pipe/p_defines.h"
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
#ifndef NV04_PFIFO_MAX_PACKET_LEN
#define NV04_PFIFO_MAX_PACKET_LEN 2047
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
index b6a827634c8..8b46e51cbaf 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
@@ -38,7 +38,7 @@
#undef NDEBUG
#include <assert.h>
-#include <libdrm/nouveau.h>
+#include <nouveau.h>
#include "nouveau_screen.h"
#include "nouveau_state.h"
#include "nouveau_surface.h"