From b2097b99a2e6cc045ee9b6d80946bc06c4d9302c Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Sun, 2 Apr 2006 21:45:03 +0000
Subject: [PATCH] ../stub

---
 ChangeLog                 |  6 ++++++
 hw/kdrive/ati/Makefile.am | 26 +++++++++++++-------------
 hw/kdrive/ati/ati.h       |  3 ++-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1843ec6b4..b0d16e507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-02  Adam Jackson  <ajax@freedesktop.org>
+
+	* hw/kdrive/ati/Makefile.am:
+	* hw/kdrive/ati/ati.h:
+	Disable building DRI support in Xati for now.
+
 2006-04-01  Eric Anholt  <anholt@FreeBSD.org>
 
 	reviewed by: keithp
diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am
index 22f763b80..b23418129 100644
--- a/hw/kdrive/ati/Makefile.am
+++ b/hw/kdrive/ati/Makefile.am
@@ -1,16 +1,16 @@
-if DRI
-DRI_INCLUDES = 	-I$(top_srcdir)/dri	\
-		-I$(top_srcdir)/drm
-DRI_LIBS = 	$(top_builddir)/dri/libdri.a	\
-		$(top_builddir)/drm/libdrm.a
-DRI_SOURCES =	ati_dri.c	\
-		ati_dri.h	\
-		ati_dripriv.h	\
-		r128_common.h	\
-		r128_sarea.h	\
-		radeon_common.h	\
-		radeon_sarea.h
-endif
+#if DRI
+#DRI_INCLUDES = 	-I$(top_srcdir)/dri	\
+#		-I$(top_srcdir)/drm
+#DRI_LIBS = 	$(top_builddir)/dri/libdri.a	\
+#		$(top_builddir)/drm/libdrm.a
+#DRI_SOURCES =	ati_dri.c	\
+#		ati_dri.h	\
+#		ati_dripriv.h	\
+#		r128_common.h	\
+#		r128_sarea.h	\
+#		radeon_common.h	\
+#		radeon_sarea.h
+#endif
 
 if KDRIVEFBDEV
 FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev
diff --git a/hw/kdrive/ati/ati.h b/hw/kdrive/ati/ati.h
index 5ffd227ca..188d0b057 100644
--- a/hw/kdrive/ati/ati.h
+++ b/hw/kdrive/ati/ati.h
@@ -39,9 +39,10 @@
 
 #include "kxv.h"
 
+#undef XF86DRI
 #ifdef XF86DRI
 #define USE_DRI
-#include "libdrm.h"
+#include "xf86drm.h"
 #include "dri.h"
 #ifdef GLXEXT
 #include "GL/glxint.h"