From ef067b5f01eb7ea7a08a64d897e0e70e139c618d Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@vmware.com>
Date: Tue, 13 Oct 2009 11:56:35 +0200
Subject: [PATCH] st/xorg: Fix dpms include problems

---
 src/gallium/state_trackers/xorg/Makefile    | 1 -
 src/gallium/state_trackers/xorg/xorg_crtc.c | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/Makefile b/src/gallium/state_trackers/xorg/Makefile
index 030bac5..27a1990 100644
--- a/src/gallium/state_trackers/xorg/Makefile
+++ b/src/gallium/state_trackers/xorg/Makefile
@@ -5,7 +5,6 @@ LIBNAME = xorgtracker
 
 LIBRARY_INCLUDES = \
 	-DHAVE_CONFIG_H \
-        -DHAVE_XEXTPROTO_71=1 \
 	$(shell pkg-config --cflags-only-I pixman-1 xorg-server libdrm xproto) \
 	-I$(TOP)/src/gallium/include \
 	-I$(TOP)/src/gallium/auxiliary \
diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c
index 9597358..67fe29a 100644
--- a/src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c
@@ -43,10 +43,10 @@
 #include "xf86Modes.h"
 
 #ifdef HAVE_XEXTPROTO_71
-#include "X11/extensions/dpmsconst.h"
+#include <X11/extensions/dpmsconst.h>
 #else
 #define DPMS_SERVER
-#include "X11/extensions/dpmsconst.h"
+#include <X11/extensions/dpms.h>
 #endif
 
 #include "pipe/p_inlines.h"
-- 
2.7.4