[xserver-commit] xfree86/drivers/trident blade_accel.c,1.22,1.23 image_accel.c,1.27,1.28 trident_accel.c,1.29,1.30 trident_bank.c,1.5,1.6 trident_dac.c,1.80,1.81 trident_dga.c,1.5,1.6 trident_driver.c,1.191,1.192 trident_i2c.c,1.5,1.6 trident_shadow.c,1.3,1.4 trident_tv.c,1.2,1.3 trident_video.c,1.46,1.47 tridenthelper.c,1.21,1.22 tridentramdac.c,1.5,1.6 tvga_dac.c,1.8,1.9 xp_accel.c,1.7,1.8

[Keith Packard]

Committed by: keithp

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

Modified Files:
	blade_accel.c image_accel.c trident_accel.c trident_bank.c 
	trident_dac.c trident_dga.c trident_driver.c trident_i2c.c 
	trident_shadow.c trident_tv.c trident_video.c tridenthelper.c 
	tridentramdac.c tvga_dac.c xp_accel.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: blade_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/blade_accel.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- a/blade_accel.c	21 Jan 2004 22:31:54 -0000	1.22
+++ b/blade_accel.c	28 Feb 2004 01:27:50 -0000	1.23
@@ -25,6 +25,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/blade_accel.c,v 1.21 2003/10/30 13:38:01 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: image_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/image_accel.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/image_accel.c	21 Jan 2004 22:57:34 -0000	1.27
+++ b/image_accel.c	28 Feb 2004 01:27:50 -0000	1.28
@@ -25,6 +25,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/image_accel.c,v 1.26 2003/10/30 13:38:01 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: trident_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/trident_accel.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- a/trident_accel.c	21 Jan 2004 22:57:34 -0000	1.29
+++ b/trident_accel.c	28 Feb 2004 01:27:50 -0000	1.30
@@ -25,6 +25,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c,v 1.28 2003/10/30 13:38:01 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: trident_bank.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/trident_bank.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/trident_bank.c	5 Sep 2003 22:07:28 -0000	1.5
+++ b/trident_bank.c	28 Feb 2004 01:27:50 -0000	1.6
@@ -24,6 +24,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_bank.c,v 1.4 2000/12/07 16:48:04 alanh Exp $ */
 
 /* All drivers should typically include these */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: trident_dac.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/trident_dac.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- a/trident_dac.c	21 Jan 2004 22:31:54 -0000	1.80
+++ b/trident_dac.c	28 Feb 2004 01:27:50 -0000	1.81
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c,v 1.79 2003/11/03 05:11:42 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: trident_dga.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/trident_dga.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/trident_dga.c	5 Sep 2003 22:07:28 -0000	1.5
+++ b/trident_dga.c	28 Feb 2004 01:27:50 -0000	1.6
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dga.c,v 1.4 2002/10/08 22:14:11 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: trident_driver.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/trident_driver.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- a/trident_driver.c	21 Jan 2004 22:51:19 -0000	1.191
+++ b/trident_driver.c	28 Feb 2004 01:27:50 -0000	1.192
@@ -30,6 +30,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.190 2004/01/21 22:31:54 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf1bpp.h"
 #include "xf4bpp.h"
 #include "fb.h"

Index: trident_i2c.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/trident_i2c.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/trident_i2c.c	13 Oct 1999 20:02:30 -0000	1.5
+++ b/trident_i2c.c	28 Feb 2004 01:27:50 -0000	1.6
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_i2c.c,v 1.2 1999/01/23 09:55:59 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: trident_shadow.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/trident_shadow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/trident_shadow.c	14 Jun 2001 02:23:50 -0000	1.3
+++ b/trident_shadow.c	28 Feb 2004 01:27:50 -0000	1.4
@@ -5,6 +5,9 @@
    based on code written by Mark Vojkovich <markv@valinux.com>
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: trident_tv.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/trident_tv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/trident_tv.c	21 Apr 2003 20:42:30 -0000	1.2
+++ b/trident_tv.c	28 Feb 2004 01:27:50 -0000	1.3
@@ -4,6 +4,9 @@
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_tv.c,v 1.1 2003/04/15 22:13:43 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86_ansic.h"
 #include "trident.h"
 #include "trident_regs.h"

Index: trident_video.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/trident_video.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- a/trident_video.c	21 Jan 2004 22:51:19 -0000	1.46
+++ b/trident_video.c	28 Feb 2004 01:27:50 -0000	1.47
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.45 2003/11/10 18:22:34 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"

Index: tridenthelper.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/tridenthelper.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- a/tridenthelper.c	5 Sep 2003 22:07:29 -0000	1.21
+++ b/tridenthelper.c	28 Feb 2004 01:27:50 -0000	1.22
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c,v 1.20 2001/10/28 03:33:52 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: tridentramdac.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/tridentramdac.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/tridentramdac.c	5 Sep 2003 22:07:29 -0000	1.5
+++ b/tridentramdac.c	28 Feb 2004 01:27:50 -0000	1.6
@@ -26,6 +26,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridentramdac.c,v 1.4 2000/12/07 16:48:06 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: tvga_dac.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/tvga_dac.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/tvga_dac.c	3 Nov 2003 05:11:43 -0000	1.8
+++ b/tvga_dac.c	28 Feb 2004 01:27:50 -0000	1.9
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tvga_dac.c,v 1.7tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: xp_accel.c
===================================================================
RCS file: /cvs/xserver/xfree86/drivers/trident/xp_accel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/xp_accel.c	21 Jan 2004 22:57:34 -0000	1.7
+++ b/xp_accel.c	28 Feb 2004 01:27:50 -0000	1.8
@@ -25,6 +25,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/xp_accel.c,v 1.6 2003/10/30 13:38:02 alanh Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"