[xserver-commit] xfree86/os-support/linux/drm/kernel dristat.c,1.2,1.3 drmstat.c,1.8,1.9 gamma_dma.c,1.21,1.22 gamma_drv.c,1.17,1.18 i810_dma.c,1.25,1.26 i810_drv.c,1.15,1.16 i830_dma.c,1.13,1.14 i830_drv.c,1.4,1.5 i830_irq.c,1.4,1.5 mga_drv.c,1.14,1.15 r128_drv.c,1.18,1.19 radeon_drv.c,1.8,1.9 sis_drv.c,1.14,1.15 tdfx_drv.c,1.14,1.15
Keith Packard
xserver-commit@pdx.freedesktop.org
Committed by: keithp
Update of /cvs/xserver/xfree86/os-support/linux/drm/kernel
In directory pdx:/tmp/cvs-serv14744/os-support/linux/drm/kernel
Modified Files:
dristat.c drmstat.c gamma_dma.c gamma_drv.c i810_dma.c
i810_drv.c i830_dma.c i830_drv.c i830_irq.c mga_drv.c
r128_drv.c radeon_drv.c sis_drv.c tdfx_drv.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: dristat.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/dristat.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/dristat.c 25 Apr 2003 00:57:23 -0000 1.2
+++ b/dristat.c 28 Feb 2004 01:27:59 -0000 1.3
@@ -27,6 +27,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Index: drmstat.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/drmstat.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/drmstat.c 25 Apr 2003 00:57:24 -0000 1.8
+++ b/drmstat.c 28 Feb 2004 01:27:59 -0000 1.9
@@ -28,6 +28,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
Index: gamma_dma.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/gamma_dma.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- a/gamma_dma.c 2 Dec 2003 13:02:42 -0000 1.21
+++ b/gamma_dma.c 28 Feb 2004 01:27:59 -0000 1.22
@@ -29,6 +29,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#define __NO_VERSION__
#include "gamma.h"
#include "drmP.h"
Index: gamma_drv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/gamma_drv.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/gamma_drv.c 2 Dec 2003 13:02:42 -0000 1.17
+++ b/gamma_drv.c 28 Feb 2004 01:27:59 -0000 1.18
@@ -29,6 +29,9 @@
* Gareth Hughes <gareth@valinux.com>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <linux/config.h>
#include "gamma.h"
#include "drmP.h"
Index: i810_dma.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/i810_dma.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- a/i810_dma.c 2 Dec 2003 13:02:42 -0000 1.25
+++ b/i810_dma.c 28 Feb 2004 01:28:00 -0000 1.26
@@ -30,6 +30,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#define __NO_VERSION__
#include "i810.h"
#include "drmP.h"
Index: i810_drv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/i810_drv.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/i810_drv.c 23 Apr 2003 01:37:13 -0000 1.15
+++ b/i810_drv.c 28 Feb 2004 01:28:00 -0000 1.16
@@ -30,6 +30,9 @@
* Gareth Hughes <gareth@valinux.com>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <linux/config.h>
#include "i810.h"
#include "drmP.h"
Index: i830_dma.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/i830_dma.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- a/i830_dma.c 2 Dec 2003 13:02:42 -0000 1.13
+++ b/i830_dma.c 28 Feb 2004 01:28:00 -0000 1.14
@@ -31,6 +31,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#define __NO_VERSION__
#include "i830.h"
#include "drmP.h"
Index: i830_drv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/i830_drv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/i830_drv.c 2 Dec 2003 13:02:42 -0000 1.4
+++ b/i830_drv.c 28 Feb 2004 01:28:00 -0000 1.5
@@ -32,6 +32,9 @@
* Keith Whitwell <keith@tungstengraphics.com>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <linux/config.h>
#include "i830.h"
#include "drmP.h"
Index: i830_irq.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/i830_irq.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/i830_irq.c 2 Dec 2003 13:02:42 -0000 1.4
+++ b/i830_irq.c 28 Feb 2004 01:28:00 -0000 1.5
@@ -26,6 +26,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#define __NO_VERSION__
#include "i830.h"
#include "drmP.h"
Index: mga_drv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/mga_drv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/mga_drv.c 2 Dec 2003 13:02:42 -0000 1.14
+++ b/mga_drv.c 28 Feb 2004 01:28:00 -0000 1.15
@@ -29,6 +29,9 @@
* Gareth Hughes <gareth@valinux.com>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <linux/config.h>
#include "mga.h"
#include "drmP.h"
Index: r128_drv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/r128_drv.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- a/r128_drv.c 2 Dec 2003 13:02:42 -0000 1.18
+++ b/r128_drv.c 28 Feb 2004 01:28:00 -0000 1.19
@@ -29,6 +29,9 @@
* Gareth Hughes <gareth@valinux.com>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <linux/config.h>
#include "r128.h"
#include "drmP.h"
Index: radeon_drv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/radeon_drv.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/radeon_drv.c 2 Dec 2003 13:02:42 -0000 1.8
+++ b/radeon_drv.c 28 Feb 2004 01:28:00 -0000 1.9
@@ -30,6 +30,9 @@
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <linux/config.h>
#include "radeon.h"
#include "drmP.h"
Index: sis_drv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/sis_drv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/sis_drv.c 23 Apr 2003 01:37:14 -0000 1.14
+++ b/sis_drv.c 28 Feb 2004 01:28:00 -0000 1.15
@@ -25,6 +25,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <linux/config.h>
#include "sis.h"
#include "drmP.h"
Index: tdfx_drv.c
===================================================================
RCS file: /cvs/xserver/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/tdfx_drv.c 2 Dec 2003 13:02:43 -0000 1.14
+++ b/tdfx_drv.c 28 Feb 2004 01:28:00 -0000 1.15
@@ -30,6 +30,9 @@
* Gareth Hughes <gareth@valinux.com>
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <linux/config.h>
#include "tdfx.h"
#include "drmP.h"