Fri Jun 11 05:41:02 EST 2004

Committed by: daniel

Update of /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel
In directory pdx:/home/daniel/x/debrix/debrix/hw/xorg/os-support/linux/drm/kernel

Modified Files:
	ati_pcigart.h dristat.c drmP.h drm_agpsupport.h drm_auth.h 
	drm_bufs.h drm_context.h drm_dma.h drm_drawable.h drm_drv.h 
	drm_fops.h drm_init.h drm_ioctl.h drm_irq.h drm_lock.h 
	drm_memory.h drm_memory_debug.h drm_os_linux.h drm_proc.h 
	drm_scatter.h drm_stub.h drm_vm.h drmstat.c gamma.h 
	gamma_dma.c gamma_drm.h gamma_drv.c gamma_drv.h gamma_lists.h 
	i810.h i810_dma.c i810_drm.h i810_drv.c i810_drv.h i830.h 
	i830_dma.c i830_drm.h i830_drv.c i830_drv.h i830_irq.c 
	mga_drv.c r128_drv.c radeon_drv.c sis_drv.c tdfx_drv.c 
Log Message:
Initial import from modular sources.


Index: ati_pcigart.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/ati_pcigart.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

--- ati_pcigart.h	23 Apr 2004 19:54:10 -0000	1.2
+++ ati_pcigart.h	10 Jun 2004 19:40:58 -0000	1.3
@@ -31,6 +31,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: dristat.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/dristat.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- dristat.c	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ dristat.c	10 Jun 2004 19:40:58 -0000	1.2
@@ -27,6 +27,9 @@
  * 
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

Index: drmP.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drmP.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drmP.h	23 Apr 2004 19:54:10 -0000	1.2
+++ drmP.h	10 Jun 2004 19:40:58 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h,v 1.1.4.3 2004/02/23 21:37:01 kaleb Exp $ */
 /**
  * \file drmP.h 
  * Private header for Direct Rendering Manager
@@ -32,6 +32,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _DRM_P_H_
 #define _DRM_P_H_
 

Index: drm_agpsupport.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_agpsupport.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_agpsupport.h	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ drm_agpsupport.h	10 Jun 2004 19:40:58 -0000	1.2
@@ -31,6 +31,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 #include <linux/module.h>

Index: drm_auth.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_auth.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_auth.h	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ drm_auth.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -33,6 +33,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_bufs.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_bufs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drm_bufs.h	23 Apr 2004 19:54:10 -0000	1.2
+++ drm_bufs.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_bufs.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /**
  * \file drm_bufs.h 
  * Generic buffer template
@@ -34,6 +34,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include <linux/vmalloc.h>
 #include "drmP.h"

Index: drm_context.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_context.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_context.h	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ drm_context.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -40,6 +40,9 @@
  *		needed by SiS driver's memory management.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_dma.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_dma.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drm_dma.h	23 Apr 2004 19:54:10 -0000	1.2
+++ drm_dma.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_dma.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /**
  * \file drm_dma.h 
  * DMA IOCTL and function support
@@ -34,6 +34,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_drawable.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_drawable.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_drawable.h	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ drm_drawable.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -33,6 +33,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_drv.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_drv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drm_drv.h	23 Apr 2004 19:54:10 -0000	1.2
+++ drm_drv.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_drv.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /**
  * \file drm_drv.h 
  * Generic driver template
@@ -53,6 +53,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef __MUST_HAVE_AGP
 #define __MUST_HAVE_AGP			0
 #endif

Index: drm_fops.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_fops.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drm_fops.h	23 Apr 2004 19:54:10 -0000	1.2
+++ drm_fops.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_fops.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /**
  * \file drm_fops.h 
  * File operations for DRM
@@ -35,6 +35,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 #include <linux/poll.h>

Index: drm_init.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_init.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_init.h	25 Nov 2003 19:28:50 -0000	1.1.1.2
+++ drm_init.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -33,6 +33,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_ioctl.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_ioctl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drm_ioctl.h	23 Apr 2004 19:54:10 -0000	1.2
+++ drm_ioctl.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_ioctl.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /**
  * \file drm_ioctl.h 
  * IOCTL processing for DRM
@@ -34,6 +34,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_irq.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_irq.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- drm_irq.h	4 Dec 2003 22:03:33 -0000	1.1.1.1
+++ drm_irq.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -33,6 +33,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_lock.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_lock.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_lock.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ drm_lock.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -33,6 +33,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_memory.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_memory.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_memory.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ drm_memory.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -33,6 +33,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include <linux/config.h>
 #include "drmP.h"

Index: drm_memory_debug.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_memory_debug.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- drm_memory_debug.h	25 Nov 2003 19:28:51 -0000	1.1.1.1
+++ drm_memory_debug.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -31,6 +31,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include <linux/config.h>
 #include "drmP.h"

Index: drm_os_linux.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_os_linux.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drm_os_linux.h	23 Apr 2004 19:54:10 -0000	1.2
+++ drm_os_linux.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,9 +1,12 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drm_os_linux.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /**
  * \file drm_os_linux.h
  * OS abstraction macros.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 
 #include <linux/interrupt.h>	/* For task queue support */

Index: drm_proc.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_proc.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_proc.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ drm_proc.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -37,6 +37,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_scatter.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_scatter.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_scatter.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ drm_scatter.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -31,6 +31,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include <linux/config.h>
 #include <linux/vmalloc.h>

Index: drm_stub.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_stub.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drm_stub.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ drm_stub.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -31,6 +31,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drm_vm.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drm_vm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- drm_vm.h	23 Apr 2004 19:54:10 -0000	1.2
+++ drm_vm.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -33,6 +33,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: drmstat.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/drmstat.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- drmstat.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ drmstat.c	10 Jun 2004 19:40:59 -0000	1.2
@@ -28,6 +28,9 @@
  * 
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

Index: gamma.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/gamma.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gamma.h	23 Apr 2004 19:54:10 -0000	1.2
+++ gamma.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /* gamma.c -- 3dlabs GMX 2000 driver -*- linux-c -*-
  * Created: Mon Jan  4 08:58:31 1999 by gareth at valinux.com
  *
@@ -28,6 +28,9 @@
  *    Gareth Hughes <gareth at valinux.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef __GAMMA_H__
 #define __GAMMA_H__
 

Index: gamma_dma.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/gamma_dma.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gamma_dma.c	23 Apr 2004 19:54:10 -0000	1.2
+++ gamma_dma.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_dma.c,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /* gamma_dma.c -- DMA support for GMX 2000 -*- linux-c -*-
  * Created: Fri Mar 19 14:30:16 1999 by faith at precisioninsight.com
  *
@@ -30,6 +30,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "gamma.h"
 #include "drmP.h"

Index: gamma_drm.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/gamma_drm.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- gamma_drm.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ gamma_drm.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _GAMMA_DRM_H_
 #define _GAMMA_DRM_H_
 

Index: gamma_drv.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/gamma_drv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gamma_drv.c	23 Apr 2004 19:54:10 -0000	1.2
+++ gamma_drv.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /* gamma.c -- 3dlabs GMX 2000 driver -*- linux-c -*-
  * Created: Mon Jan  4 08:58:31 1999 by faith at precisioninsight.com
  *
@@ -30,6 +30,9 @@
  *    Gareth Hughes <gareth at valinux.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <linux/config.h>
 #include "gamma.h"
 #include "drmP.h"

Index: gamma_drv.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/gamma_drv.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- gamma_drv.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ gamma_drv.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -29,6 +29,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _GAMMA_DRV_H_
 #define _GAMMA_DRV_H_
 

Index: gamma_lists.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/gamma_lists.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gamma_lists.h	25 Nov 2003 19:28:51 -0000	1.1.1.1
+++ gamma_lists.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -29,6 +29,9 @@
  *    Gareth Hughes <gareth at valinux.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "drmP.h"
 

Index: i810.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i810.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i810.h	23 Apr 2004 19:54:10 -0000	1.2
+++ i810.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /* i810.h -- Intel i810/i815 DRM template customization -*- linux-c -*-
  * Created: Thu Feb 15 00:01:12 2001 by gareth at valinux.com
  *
@@ -28,6 +28,9 @@
  *    Gareth Hughes <gareth at valinux.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef __I810_H__
 #define __I810_H__
 

Index: i810_dma.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i810_dma.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i810_dma.c	23 Apr 2004 19:54:10 -0000	1.2
+++ i810_dma.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /* i810_dma.c -- DMA support for the i810 -*- linux-c -*-
  * Created: Mon Dec 13 01:50:01 1999 by jhartmann at precisioninsight.com
  *
@@ -31,6 +31,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "i810.h"
 #include "drmP.h"

Index: i810_drm.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i810_drm.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- i810_drm.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ i810_drm.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _I810_DRM_H_
 #define _I810_DRM_H_
 

Index: i810_drv.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i810_drv.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- i810_drv.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ i810_drv.c	10 Jun 2004 19:40:59 -0000	1.2
@@ -30,6 +30,9 @@
  *    Gareth Hughes <gareth at valinux.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <linux/config.h>
 #include "i810.h"
 #include "drmP.h"

Index: i810_drv.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i810_drv.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- i810_drv.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ i810_drv.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -29,6 +29,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _I810_DRV_H_
 #define _I810_DRV_H_
 

Index: i830.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i830.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i830.h	23 Apr 2004 19:54:10 -0000	1.2
+++ i830.h	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i830.h,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /* i830.h -- Intel I830 DRM template customization -*- linux-c -*-
  * Created: Thu Feb 15 00:01:12 2001 by gareth at valinux.com
  *
@@ -28,6 +28,9 @@
  *    Gareth Hughes <gareth at valinux.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef __I830_H__
 #define __I830_H__
 

Index: i830_dma.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i830_dma.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i830_dma.c	23 Apr 2004 19:54:10 -0000	1.2
+++ i830_dma.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i830_dma.c,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /* i830_dma.c -- DMA support for the I830 -*- linux-c -*-
  * Created: Mon Dec 13 01:50:01 1999 by jhartmann at precisioninsight.com
  *
@@ -32,6 +32,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define __NO_VERSION__
 #include "i830.h"
 #include "drmP.h"

Index: i830_drm.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i830_drm.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- i830_drm.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ i830_drm.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _I830_DRM_H_
 #define _I830_DRM_H_
 

Index: i830_drv.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i830_drv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i830_drv.c	23 Apr 2004 19:54:10 -0000	1.2
+++ i830_drv.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i830_drv.c,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /* i830_drv.c -- I810 driver -*- linux-c -*-
  * Created: Mon Dec 13 01:56:22 1999 by jhartmann at precisioninsight.com
  *
@@ -33,6 +33,9 @@
  *    Keith Whitwell <keith at tungstengraphics.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <linux/config.h>
 #include "i830.h"
 #include "drmP.h"

Index: i830_drv.h
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i830_drv.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- i830_drv.h	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ i830_drv.h	10 Jun 2004 19:40:59 -0000	1.2
@@ -29,6 +29,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _I830_DRV_H_
 #define _I830_DRV_H_
 

Index: i830_irq.c
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/os-support/linux/drm/kernel/i830_irq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- i830_irq.c	23 Apr 2004 19:54:10 -0000	1.2
+++ i830_irq.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i830_irq.c,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /* i830_dma.c -- DMA support for the I830 -*- linux-c -*-
  *
  * Copyright 2002 Tungsten Graphics, Inc.
@@ -27,6 +27,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/debrix/hw/xorg/os-support/linux/drm/kernel/mga_drv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mga_drv.c	23 Apr 2004 19:54:10 -0000	1.2
+++ mga_drv.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c,v 1.1.4.1 2003/12/06 13:24:28 kaleb Exp $ */
 /* mga_drv.c -- Matrox G200/G400 driver -*- linux-c -*-
  * Created: Mon Dec 13 01:56:22 1999 by jhartmann at precisioninsight.com
  *
@@ -30,6 +30,9 @@
  *    Gareth Hughes <gareth at 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/debrix/hw/xorg/os-support/linux/drm/kernel/r128_drv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- r128_drv.c	23 Apr 2004 19:54:10 -0000	1.2
+++ r128_drv.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c,v 1.1.4.1 2003/12/06 13:24:28 kaleb Exp $ */
 /* r128_drv.c -- ATI Rage 128 driver -*- linux-c -*-
  * Created: Mon Dec 13 09:47:27 1999 by faith at precisioninsight.com
  *
@@ -30,6 +30,9 @@
  *    Gareth Hughes <gareth at 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/debrix/hw/xorg/os-support/linux/drm/kernel/radeon_drv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- radeon_drv.c	23 Apr 2004 19:54:10 -0000	1.2
+++ radeon_drv.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/radeon_drv.c,v 1.1.4.2 2003/12/06 13:24:28 kaleb Exp $ */
 /**
  * \file radeon_drv.c
  * ATI Radeon driver
@@ -31,6 +31,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/debrix/hw/xorg/os-support/linux/drm/kernel/sis_drv.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- sis_drv.c	25 Nov 2003 19:28:51 -0000	1.1.1.2
+++ sis_drv.c	10 Jun 2004 19:40:59 -0000	1.2
@@ -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/debrix/hw/xorg/os-support/linux/drm/kernel/tdfx_drv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tdfx_drv.c	23 Apr 2004 19:54:10 -0000	1.2
+++ tdfx_drv.c	10 Jun 2004 19:40:59 -0000	1.3
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c,v 1.1.4.1 2003/12/06 13:24:28 kaleb Exp $ */
 /* tdfx_drv.c -- tdfx driver -*- linux-c -*-
  * Created: Thu Oct  7 10:38:32 1999 by faith at precisioninsight.com
  *
@@ -31,6 +31,9 @@
  *    Gareth Hughes <gareth at valinux.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <linux/config.h>
 #include "tdfx.h"
 #include "drmP.h"


