[xserver-commit] xfree86/drivers/ati ati.c,1.24,1.25 atiaccel.c,1.14,1.15 atiadapter.c,1.18,1.19 atiadjust.c,1.16,1.17 atiaudio.c,1.2,1.3 atibank.c,1.13,1.14 atibus.c,1.19,1.20 atichip.c,1.38,1.39 atichip.h,1.26,1.27 aticlock.c,1.22,1.23 aticonfig.c,1.15,1.16 aticonsole.c,1.23,1.24 aticursor.c,1.5,1.6 atidac.c,1.19,1.20 atidecoder.c,1.2,1.3 atidga.c,1.11,1.12 atidsp.c,1.22,1.23 atii2c.c,1.4,1.5 atiident.c,1.12,1.13 atiload.c,1.16,1.17 atilock.c,1.20,1.21 atimach64.c,1.53,1.54 atimach64accel.c,1.2,1.3 atimach64cursor.c,1.2,1.3 atimach64i2c.c,1.2,1.3 atimach64io.c,1.7,1.8 atimach64xv.c,1.8,1.9 atimisc.c,1.8,1.9 atimode.c,1.18,1.19 atimodule.c,1.17,1.18 atioption.c,1.23,1.24 atipreinit.c,1.75,1.76 atiprint.c,1.29,1.30 atiprobe.c,1.62,1.63 atiproto.h,1.9,1.10 atirgb514.c,1.5,1.6 atiscreen.c,1.31,1.32 atituner.c,1.2,1.3 atiutil.c,1.9,1.10 ativalid.c,1.18,1.19 ativga.c,1.21,1.22 ativgaio.c,1.5,1.6 atividmem.c,1.16,1.17 atiwonder.c,1.15,1.16 atiwonderio.c,1.5,1.6 atixv.c,1.6,1.7 r128_accel.c,1.18,1.19 r128_cursor.c,1.6,1.7 r128_dga.c,1.10,1.11 r128_dri.c,1.32,1.33 r128_driver.c,1.89,1.90 r128_misc.c,1.6,1.7 r128_probe.c,1.18,1.19 r128_sarea.h,1.9,1.10 r128_video.c,1.31,1.32 radeon_accel.c,1.36,1.37 radeon_accelfuncs.c,1.8,1.9 radeon_cursor.c,1.26,1.27 radeon_dga.c,1.12,1.13 radeon_dri.c,1.40,1.41 radeon_driver.c,1.116,1.117 radeon_misc.c,1.8,1.9 radeon_probe.c,1.31,1.32 radeon_probe.h,1.14,1.15 radeon_video.c,1.31,1.32

Keith Packard xserver-commit@pdx.freedesktop.org 

Committed by: keithp

Update of /cvs/xserver/xfree86/drivers/ati
In directory pdx:/tmp/cvs-serv14744/drivers/ati

Modified Files:
	ati.c atiaccel.c atiadapter.c atiadjust.c atiaudio.c atibank.c 
	atibus.c atichip.c atichip.h aticlock.c aticonfig.c 
	aticonsole.c aticursor.c atidac.c atidecoder.c atidga.c 
	atidsp.c atii2c.c atiident.c atiload.c atilock.c atimach64.c 
	atimach64accel.c atimach64cursor.c atimach64i2c.c 
	atimach64io.c atimach64xv.c atimisc.c atimode.c atimodule.c 
	atioption.c atipreinit.c atiprint.c atiprobe.c atiproto.h 
	atirgb514.c atiscreen.c atituner.c atiutil.c ativalid.c 
	ativga.c ativgaio.c atividmem.c atiwonder.c atiwonderio.c 
	atixv.c r128_accel.c r128_cursor.c r128_dga.c r128_dri.c 
	r128_driver.c r128_misc.c r128_probe.c r128_sarea.h 
	r128_video.c radeon_accel.c radeon_accelfuncs.c 
	radeon_cursor.c radeon_dga.c radeon_dri.c radeon_driver.c 
	radeon_misc.c radeon_probe.c radeon_probe.h radeon_video.c 
Log Message:
	* Makefile.am
	* *.c
	Ok, everyone gets #include <config.h>
	Other than that, I fixed a few extension header paths and
	whacked at the Makefile.am.  Makefile.am is a hacked version
	of xserver/Makefile.am; expect them to diverge until we can
	stick the xfree86 DDX stuff into the standard Makefile.am.


Index: ati.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/ati.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- a/ati.c	5 Jan 2004 16:42:00 -0000	1.24
+++ b/ati.c	28 Feb 2004 01:27:38 -0000	1.25
@@ -54,6 +54,9 @@
  * V3, including OEM counterparts.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiident.h"
 #include "atioption.h"
 #include "atiprobe.h"

Index: atiaccel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiaccel.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/atiaccel.c	5 Jan 2004 16:42:00 -0000	1.14
+++ b/atiaccel.c	28 Feb 2004 01:27:38 -0000	1.15
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiaccel.h"
 #include "atiadapter.h"
 #include "atimach64accel.h"

Index: atiadapter.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiadapter.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/atiadapter.c	5 Jan 2004 16:42:00 -0000	1.18
+++ b/atiadapter.c	28 Feb 2004 01:27:38 -0000	1.19
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiadapter.h"
 
 /*

Index: atiadjust.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiadjust.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/atiadjust.c	5 Jan 2004 16:42:00 -0000	1.16
+++ b/atiadjust.c	28 Feb 2004 01:27:38 -0000	1.17
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadjust.h"
 #include "atichip.h"

Index: atiaudio.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiaudio.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/atiaudio.c	5 Jan 2004 16:42:00 -0000	1.2
+++ b/atiaudio.c	28 Feb 2004 01:27:38 -0000	1.3
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiaudio.h"
 
 /*

Index: atibank.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atibank.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/atibank.c	5 Jan 2004 16:42:00 -0000	1.13
+++ b/atibank.c	28 Feb 2004 01:27:38 -0000	1.14
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atibank.h"
 #include "atimach64io.h"

Index: atibus.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atibus.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/atibus.c	5 Jan 2004 16:42:00 -0000	1.19
+++ b/atibus.c	28 Feb 2004 01:27:38 -0000	1.20
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atibus.h"

Index: atichip.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atichip.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- a/atichip.c	5 Jan 2004 16:42:00 -0000	1.38
+++ b/atichip.c	28 Feb 2004 01:27:38 -0000	1.39
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atibus.h"
 #include "atichip.h"

Index: atichip.h
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atichip.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- a/atichip.h	5 Jan 2004 16:42:01 -0000	1.26
+++ b/atichip.h	28 Feb 2004 01:27:38 -0000	1.27
@@ -27,7 +27,7 @@
 #include "atipriv.h"
 #include "atiregs.h"
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 /*
  * Chip-related definitions.

Index: aticlock.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/aticlock.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- a/aticlock.c	5 Jan 2004 16:42:01 -0000	1.22
+++ b/aticlock.c	28 Feb 2004 01:27:38 -0000	1.23
@@ -192,6 +192,9 @@
  * The Mach64's clock divider is not used in this case.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"

Index: aticonfig.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/aticonfig.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/aticonfig.c	5 Jan 2004 16:42:01 -0000	1.15
+++ b/aticonfig.c	28 Feb 2004 01:27:38 -0000	1.16
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"

Index: aticonsole.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/aticonsole.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- a/aticonsole.c	5 Jan 2004 16:42:01 -0000	1.23
+++ b/aticonsole.c	28 Feb 2004 01:27:38 -0000	1.24
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiadapter.h"
 #include "aticonsole.h"
 #include "aticrtc.h"

Index: aticursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/aticursor.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/aticursor.c	5 Jan 2004 16:42:01 -0000	1.5
+++ b/aticursor.c	28 Feb 2004 01:27:38 -0000	1.6
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiadapter.h"
 #include "aticursor.h"
 #include "atimach64cursor.h"

Index: atidac.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atidac.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/atidac.c	5 Jan 2004 16:42:01 -0000	1.19
+++ b/atidac.c	28 Feb 2004 01:27:38 -0000	1.20
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atidac.h"
 #include "atimach64io.h"

Index: atidecoder.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atidecoder.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/atidecoder.c	5 Jan 2004 16:42:01 -0000	1.2
+++ b/atidecoder.c	28 Feb 2004 01:27:38 -0000	1.3
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atidecoder.h"
 
 /*

Index: atidga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atidga.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/atidga.c	5 Jan 2004 16:42:01 -0000	1.11
+++ b/atidga.c	28 Feb 2004 01:27:38 -0000	1.12
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef AVOID_DGA
 
 #include "ati.h"

Index: atidsp.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atidsp.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- a/atidsp.c	5 Jan 2004 16:42:02 -0000	1.22
+++ b/atidsp.c	28 Feb 2004 01:27:38 -0000	1.23
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atichip.h"
 #include "aticrtc.h"

Index: atii2c.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atii2c.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/atii2c.c	5 Jan 2004 16:42:02 -0000	1.4
+++ b/atii2c.c	28 Feb 2004 01:27:38 -0000	1.5
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiadapter.h"
 #include "atii2c.h"
 #include "atiload.h"

Index: atiident.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiident.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/atiident.c	5 Jan 2004 16:42:02 -0000	1.12
+++ b/atiident.c	28 Feb 2004 01:27:38 -0000	1.13
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiident.h"
 #include "atiutil.h"

Index: atiload.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiload.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/atiload.c	5 Jan 2004 16:42:02 -0000	1.16
+++ b/atiload.c	28 Feb 2004 01:27:38 -0000	1.17
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86LOADER
 
 #include "ati.h"

Index: atilock.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atilock.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- a/atilock.c	5 Jan 2004 16:42:02 -0000	1.20
+++ b/atilock.c	28 Feb 2004 01:27:38 -0000	1.21
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"

Index: atimach64.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atimach64.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- a/atimach64.c	5 Jan 2004 16:42:02 -0000	1.53
+++ b/atimach64.c	28 Feb 2004 01:27:38 -0000	1.54
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atibus.h"
 #include "atichip.h"

Index: atimach64accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atimach64accel.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/atimach64accel.c	5 Jan 2004 16:42:02 -0000	1.2
+++ b/atimach64accel.c	28 Feb 2004 01:27:38 -0000	1.3
@@ -44,6 +44,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atichip.h"
 #include "atimach64accel.h"

Index: atimach64cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atimach64cursor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/atimach64cursor.c	5 Jan 2004 16:42:02 -0000	1.2
+++ b/atimach64cursor.c	28 Feb 2004 01:27:38 -0000	1.3
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "aticrtc.h"
 #include "atimach64accel.h"

Index: atimach64i2c.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atimach64i2c.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/atimach64i2c.c	5 Jan 2004 16:42:02 -0000	1.2
+++ b/atimach64i2c.c	28 Feb 2004 01:27:38 -0000	1.3
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atichip.h"
 #include "atii2c.h"

Index: atimach64io.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atimach64io.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/atimach64io.c	5 Jan 2004 16:42:02 -0000	1.7
+++ b/atimach64io.c	28 Feb 2004 01:27:38 -0000	1.8
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atichip.h"
 #include "atimach64io.h"

Index: atimach64xv.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atimach64xv.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/atimach64xv.c	5 Jan 2004 16:42:03 -0000	1.8
+++ b/atimach64xv.c	28 Feb 2004 01:27:38 -0000	1.9
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiaccel.h"
 #include "atichip.h"

Index: atimisc.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atimisc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/atimisc.c	5 Jan 2004 16:42:03 -0000	1.8
+++ b/atimisc.c	28 Feb 2004 01:27:38 -0000	1.9
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86LOADER
 
 #include "ati.h"

Index: atimode.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atimode.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/atimode.c	5 Jan 2004 16:42:03 -0000	1.18
+++ b/atimode.c	28 Feb 2004 01:27:38 -0000	1.19
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"

Index: atimodule.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atimodule.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/atimodule.c	5 Jan 2004 16:42:03 -0000	1.17
+++ b/atimodule.c	28 Feb 2004 01:27:38 -0000	1.18
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86LOADER
 
 #include "ati.h"

Index: atioption.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atioption.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- a/atioption.c	5 Jan 2004 16:42:03 -0000	1.23
+++ b/atioption.c	28 Feb 2004 01:27:38 -0000	1.24
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atioption.h"
 #include "atiutil.h"
 

Index: atipreinit.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atipreinit.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- a/atipreinit.c	5 Jan 2004 16:42:03 -0000	1.75
+++ b/atipreinit.c	28 Feb 2004 01:27:38 -0000	1.76
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atiadjust.h"

Index: atiprint.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiprint.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- a/atiprint.c	5 Jan 2004 16:42:04 -0000	1.29
+++ b/atiprint.c	28 Feb 2004 01:27:38 -0000	1.30
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"

Index: atiprobe.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiprobe.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- a/atiprobe.c	5 Jan 2004 16:42:04 -0000	1.62
+++ b/atiprobe.c	28 Feb 2004 01:27:38 -0000	1.63
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atiadjust.h"

Index: atiproto.h
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiproto.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/atiproto.h	5 Jan 2004 16:42:04 -0000	1.9
+++ b/atiproto.h	28 Feb 2004 01:27:38 -0000	1.10
@@ -24,7 +24,7 @@
 #ifndef ___ATIPROTO_H___
 #define ___ATIPROTO_H___ 1
 
-#include "Xfuncproto.h"
+#include <X11/Xfuncproto.h>
 
 /*
  * This isn't quite ready for Xfuncproto.h yet.

Index: atirgb514.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atirgb514.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/atirgb514.c	5 Jan 2004 16:42:04 -0000	1.5
+++ b/atirgb514.c	28 Feb 2004 01:27:38 -0000	1.6
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "aticrtc.h"
 #include "atimach64io.h"

Index: atiscreen.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiscreen.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- a/atiscreen.c	5 Jan 2004 16:42:04 -0000	1.31
+++ b/atiscreen.c	28 Feb 2004 01:27:38 -0000	1.32
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiaccel.h"
 #include "aticonsole.h"

Index: atituner.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atituner.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/atituner.c	5 Jan 2004 16:42:04 -0000	1.2
+++ b/atituner.c	28 Feb 2004 01:27:38 -0000	1.3
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atituner.h"
 
 /* Temporary interface glitch */

Index: atiutil.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiutil.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/atiutil.c	5 Jan 2004 16:42:05 -0000	1.9
+++ b/atiutil.c	28 Feb 2004 01:27:38 -0000	1.10
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiutil.h"
 
 /*

Index: ativalid.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/ativalid.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/ativalid.c	5 Jan 2004 16:42:05 -0000	1.18
+++ b/ativalid.c	28 Feb 2004 01:27:38 -0000	1.19
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiadapter.h"
 #include "atichip.h"
 #include "aticrtc.h"

Index: ativga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/ativga.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- a/ativga.c	5 Jan 2004 16:42:05 -0000	1.21
+++ b/ativga.c	28 Feb 2004 01:27:38 -0000	1.22
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atichip.h"

Index: ativgaio.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/ativgaio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/ativgaio.c	5 Jan 2004 16:42:05 -0000	1.5
+++ b/ativgaio.c	28 Feb 2004 01:27:38 -0000	1.6
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atistruct.h"
 #include "ativgaio.h"

Index: atividmem.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atividmem.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/atividmem.c	5 Jan 2004 16:42:05 -0000	1.16
+++ b/atividmem.c	28 Feb 2004 01:27:38 -0000	1.17
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atiadapter.h"
 #include "atistruct.h"

Index: atiwonder.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiwonder.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/atiwonder.c	5 Jan 2004 16:42:05 -0000	1.15
+++ b/atiwonder.c	28 Feb 2004 01:27:38 -0000	1.16
@@ -50,6 +50,9 @@
  * accessed at indices 0xB0 through 0xBF on all chipsets.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atichip.h"
 #include "atiwonder.h"

Index: atiwonderio.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atiwonderio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/atiwonderio.c	5 Jan 2004 16:42:05 -0000	1.5
+++ b/atiwonderio.c	28 Feb 2004 01:27:38 -0000	1.6
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "ati.h"
 #include "atichip.h"
 #include "atiwonderio.h"

Index: atixv.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/atixv.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/atixv.c	5 Jan 2004 16:42:05 -0000	1.6
+++ b/atixv.c	28 Feb 2004 01:27:38 -0000	1.7
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atiadapter.h"
 #include "atimach64xv.h"
 #include "atistruct.h"

Index: r128_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/r128_accel.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/r128_accel.c	10 Nov 2003 18:41:20 -0000	1.18
+++ b/r128_accel.c	28 Feb 2004 01:27:38 -0000	1.19
@@ -77,6 +77,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define R128_TRAPEZOIDS 0       /* Trapezoids don't work               */
 
 				/* Driver data structures */

Index: r128_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/r128_cursor.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/r128_cursor.c	13 Feb 2003 20:28:40 -0000	1.6
+++ b/r128_cursor.c	28 Feb 2004 01:27:38 -0000	1.7
@@ -45,6 +45,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_reg.h"
 

Index: r128_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/r128_dga.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/r128_dga.c	10 Nov 2003 18:41:20 -0000	1.10
+++ b/r128_dga.c	28 Feb 2004 01:27:38 -0000	1.11
@@ -6,6 +6,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_probe.h"
 

Index: r128_dri.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/r128_dri.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- a/r128_dri.c	10 Nov 2003 18:41:20 -0000	1.32
+++ b/r128_dri.c	28 Feb 2004 01:27:38 -0000	1.33
@@ -38,6 +38,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_dri.h"
 #include "r128_reg.h"

Index: r128_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/r128_driver.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- a/r128_driver.c	29 Jan 2004 03:37:16 -0000	1.89
+++ b/r128_driver.c	28 Feb 2004 01:27:38 -0000	1.90
@@ -59,6 +59,9 @@
 
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_probe.h"
 #include "r128_reg.h"

Index: r128_misc.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/r128_misc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/r128_misc.c	5 Jan 2004 16:42:05 -0000	1.6
+++ b/r128_misc.c	28 Feb 2004 01:27:38 -0000	1.7
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86LOADER
 
 #include "ativersion.h"

Index: r128_probe.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/r128_probe.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/r128_probe.c	9 Feb 2003 15:33:17 -0000	1.18
+++ b/r128_probe.c	28 Feb 2004 01:27:38 -0000	1.19
@@ -36,6 +36,9 @@
  * Modified by Marc Aurele La France <tsi@xfree86.org> for ATI driver merge.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atimodule.h"
 #include "ativersion.h"
 

Index: r128_sarea.h
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/r128_sarea.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/r128_sarea.h	3 Oct 2003 20:11:11 -0000	1.9
+++ b/r128_sarea.h	28 Feb 2004 01:27:38 -0000	1.10
@@ -38,7 +38,7 @@
 #ifndef _R128_SAREA_H_
 #define _R128_SAREA_H_
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 /* WARNING: If you change any of these defines, make sure to change the
  * defines in the kernel file (r128_drm.h)

Index: r128_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/r128_video.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- a/r128_video.c	10 Nov 2003 18:41:21 -0000	1.31
+++ b/r128_video.c	28 Feb 2004 01:27:38 -0000	1.32
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c,v 1.30 2003/11/10 18:22:18 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "r128.h"
 #include "r128_reg.h"
 
@@ -11,7 +14,7 @@
 #include "xf86.h"
 #include "dixstruct.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "fourcc.h"
 
 #define OFF_DELAY       250  /* milliseconds */

Index: radeon_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_accel.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- a/radeon_accel.c	10 Nov 2003 18:41:22 -0000	1.36
+++ b/radeon_accel.c	28 Feb 2004 01:27:38 -0000	1.37
@@ -71,6 +71,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "radeon.h"
 #include "radeon_macros.h"
 #include "radeon_probe.h"

Index: radeon_accelfuncs.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_accelfuncs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/radeon_accelfuncs.c	3 Nov 2003 05:11:05 -0000	1.8
+++ b/radeon_accelfuncs.c	28 Feb 2004 01:27:38 -0000	1.9
@@ -71,6 +71,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #if defined(ACCEL_MMIO) && defined(ACCEL_CP)
 #error Cannot define both MMIO and CP acceleration!
 #endif

Index: radeon_cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_cursor.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- a/radeon_cursor.c	10 Nov 2003 18:41:22 -0000	1.26
+++ b/radeon_cursor.c	28 Feb 2004 01:27:38 -0000	1.27
@@ -45,6 +45,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "radeon.h"
 #include "radeon_macros.h"
 #include "radeon_reg.h"

Index: radeon_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_dga.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/radeon_dga.c	10 Nov 2003 18:41:22 -0000	1.12
+++ b/radeon_dga.c	28 Feb 2004 01:27:38 -0000	1.13
@@ -40,6 +40,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "radeon.h"
 #include "radeon_probe.h"
 

Index: radeon_dri.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_dri.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- a/radeon_dri.c	10 Nov 2003 18:41:22 -0000	1.40
+++ b/radeon_dri.c	28 Feb 2004 01:27:38 -0000	1.41
@@ -37,6 +37,9 @@
 
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "radeon.h"
 #include "radeon_macros.h"
 #include "radeon_dri.h"

Index: radeon_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_driver.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- a/radeon_driver.c	19 Nov 2003 02:08:15 -0000	1.116
+++ b/radeon_driver.c	28 Feb 2004 01:27:38 -0000	1.117
@@ -59,6 +59,9 @@
  */
 
 				/* Driver data structures */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "radeon.h"
 #include "radeon_macros.h"
 #include "radeon_probe.h"

Index: radeon_misc.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_misc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/radeon_misc.c	5 Jan 2004 16:42:05 -0000	1.8
+++ b/radeon_misc.c	28 Feb 2004 01:27:38 -0000	1.9
@@ -21,6 +21,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef XFree86LOADER
 
 #include "ativersion.h"

Index: radeon_probe.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_probe.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- a/radeon_probe.c	10 Nov 2003 18:41:23 -0000	1.31
+++ b/radeon_probe.c	28 Feb 2004 01:27:38 -0000	1.32
@@ -35,6 +35,9 @@
  * Modified by Marc Aurele La France <tsi@xfree86.org> for ATI driver merge.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "atimodule.h"
 #include "ativersion.h"
 
@@ -46,7 +49,7 @@
 #include "xf86.h"
 #include "xf86_ansic.h"
 #define _XF86MISC_SERVER_
-#include "xf86misc.h"
+#include <X11/extensions/xf86misc.h>
 #include "xf86Resources.h"
 
 #ifdef XFree86LOADER

Index: radeon_probe.h
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_probe.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/radeon_probe.h	10 Nov 2003 18:41:23 -0000	1.14
+++ b/radeon_probe.h	28 Feb 2004 01:27:38 -0000	1.15
@@ -43,7 +43,7 @@
 #include "xf86DDC.h"
 
 #define _XF86MISC_SERVER_
-#include "xf86misc.h"
+#include <X11/extensions/xf86misc.h>
 
 typedef struct
 {

Index: radeon_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/ati/radeon_video.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- a/radeon_video.c	10 Nov 2003 18:41:23 -0000	1.31
+++ b/radeon_video.c	28 Feb 2004 01:27:38 -0000	1.32
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_video.c,v 1.30 2003/11/10 18:22:18 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "radeon.h"
 #include "radeon_macros.h"
 #include "radeon_probe.h"
@@ -8,7 +11,7 @@
 #include "xf86.h"
 #include "dixstruct.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "fourcc.h"
 
 #define OFF_DELAY       250  /* milliseconds */