[Xorg-commit] xc/programs/Xserver/hw/xfree86/os-support/linux/drm xf86drmCompat.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/drm
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/hw/xfree86/os-support/linux/drm

Modified Files:
      Tag: XORG-CURRENT
	xf86drmCompat.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: xf86drmCompat.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xf86drmCompat.c	6 Dec 2003 13:24:26 -0000	1.1.4.2
+++ b/xf86drmCompat.c	23 Feb 2004 21:37:00 -0000	1.1.4.3
@@ -26,9 +26,9 @@
  *   Jens Owen <jens at tungstengraphics.com>
  *
  */
-/* $XdotOrg$ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c,v 1.3 2003/12/02 13:02:41 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c,v 1.4 2003/12/30 22:11:12 tsi Exp $ */
 
+#include <sys/types.h>		/* for int64_t & friends */
 #ifdef XFree86Server
 # include "xf86.h"
 # include "xf86_OSproc.h"
@@ -76,7 +76,6 @@
 #include "drm.h"
 #include "mga_drm.h"
 #include "r128_drm.h"
-#include <inttypes.h>		/* for int64_t & friends */
 #include "radeon_drm.h"
 #ifndef __FreeBSD__
 #include "sis_drm.h"