Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

33 files changed, 51 insertions, 46 deletions

diff --git a/README.sgml b/README.sgml
index a3c5391..4439a7f 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN"[
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -8,7 +8,6 @@
 <date>9 June 2000, last update by Dejan Ilic <email>dejan.ilic@home.se</email>
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/rendition.sgml,v 1.13 2003/10/19 19:47:17 dawes Exp $
 </ident>
 
 <toc>
@@ -20,7 +19,7 @@ was tested on a miroCRYSTAL VRX (V1000), Intergraph Intense-100 3D (V1000), Diam
 <sect>Limitations <p>
 V1000 cards can only work as primary display card due to hardware limitations. <p>
 V2x00 cards can work even if not primary, but primary display card will be disabled when server is run. This is a driver limitation.<p>
-Hopefully these limitations will be workaround and fixed before final XFree86 4.0 release.<p>
+Hopefully these limitations were worked around and fixed before final XFree86 4.0 release.<p>
 
 <sect>Important notices <p>
 Some V1000-based video cards are known to lock up the computer if you have write-combine activated. Disabling it removes the problem. Look for settings in the motherboards BIOS and disable ALL settings that has to do with write-combine (usually called USWC or just WC for short). <p>
@@ -47,7 +46,7 @@ acceleration are next on the list of features to be included.<p>
 </itemize>
 </itemize>
 
-<sect>XF86Config Option <p>
+<sect>xorg.conf Option <p>
 <descrip>
 <tag>Option "SW_Cursor"</tag>
 Disables use of the hardware cursor.
@@ -60,7 +59,10 @@ Set custom ramdac limit. We have currently no way of knowing if the v2x00 chip i
 <tag>Option "FramebufferWC"</tag>
 If writecombine is disabled in BIOS, and you add this option in configuration file, then the driver will try to request writecombined access to the framebuffer. This can drastically increase the performance on unaccelerated server. Requires that "MTRR"-support is compiled into the OS-kernel.
 <tag>Option "NoDDC"</tag>
-Disable probing of DDC-information from your monitor. This information is not used yet and is only there for informational purposes. This might change before final XFree86 4.0 release. Safe to disable if you experience problems during startup of X-server.
+Disable probing of DDC-information from your monitor. This information is
+not used yet and is only there for informational purposes. This might
+have changed before final XFree86 4.0 release. Safe to disable if you experience
+problems during startup of X-server.
 <tag>Option "ShadowFB"</tag>
 If this option is enabled, the driver will cause the CPU to do each drawing
 operation first into a shadow frame buffer in system virtual memory and then
@@ -77,7 +79,10 @@ Notice that this option requires "ShadowFB" and automatically enable it. It also
 The option is not activated by default.
 </descrip>
 
-<sect>News in this release (XFree86 4.1)<p>
+<sect>News in the X11R&relvers; release<p>
+This driver was originally part of the XFree86 4.4 rc2 release.
+
+<sect>News in the XFree86 4.1 release <p>
 <itemize>
 <item>DirectColor support
 <item>SilkenMouse support
diff --git a/man/rendition.man b/man/rendition.man
index b286f59..aaee1c7 100644
--- a/man/rendition.man
+++ b/man/rendition.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.1 2001/01/24 00:06:26 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH RENDITION __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ rendition \- Rendition video driver
 .fi
 .SH DESCRIPTION
 .B rendition 
-is an XFree86 driver for Rendition/Micron based video cards.  The driver
+is an __xservername__ driver for Rendition/Micron based video cards.  The driver
 supports following framebuffer depths: 8, 15 (Verite V1000 only), 16
 and 24. Acceleration and multi-head configurations are
 not supported yet, but are work in progress.
@@ -32,7 +32,7 @@ Verite V2100 based cards. Diamond Stealth II S220 is the only known such card.
 .B V2200
 Verite V2200 based cards.
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .PP
@@ -79,9 +79,9 @@ Default: Disabled for V1000, enabled for V2100/V2200.
 .TP
 .BI "Option \*qNoDDC\*q \*q" boolean \*q
 Disable probing of DDC-information from your monitor. This information is not
-used yet and is only there for informational purposes. This might change
-before final XFree86 4.0 release. Safe to disable if you experience problems
-during startup of X-server.
+used yet and is only there for informational purposes.  
+Safe to disable if you experience problems
+during startup of __xservername__.
 Default: Probe DDC.
 .TP
 .BI "Option \*qShadowFB\*q \*q" boolean \*q
@@ -107,6 +107,6 @@ as there has been indications of problems with it. Use
 .B "Option \*qMTRR\*q"
 to let the driver request write-combining of memory access on the video board.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Marc Langenbach, Dejan Ilic
diff --git a/src/accel.h b/src/accel.h
index e2cfba7..ea814b6 100644
--- a/src/accel.h
+++ b/src/accel.h
@@ -3,7 +3,7 @@
  *
  * header file for accel.c
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accel.h,v 1.3 1999/11/19 13:54:44 hohndel Exp $ */
+/* $XFree86$ */
 
 #ifndef __ACCEL_H__
 #define __ACCEL_H__
diff --git a/src/accelX.c b/src/accelX.c
index 04d92b5..9f1b06e 100644
--- a/src/accelX.c
+++ b/src/accelX.c
@@ -3,7 +3,7 @@
  *
  * accelerator functions for X
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c,v 1.12 2002/04/04 14:05:45 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c,v 1.10 2001/06/15 21:22:54 dawes Exp $ */
 
 
 
diff --git a/src/cmd2d.h b/src/cmd2d.h
index 8290ac7..a3866b5 100644
--- a/src/cmd2d.h
+++ b/src/cmd2d.h
@@ -4,7 +4,7 @@
 /*
  * commands the 2d microcode offers
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cmd2d.h,v 1.2 1999/10/14 04:43:14 dawes Exp $ */
+/* $XFree86$ */
 
 #define CMD_SETUP					32
 #define CMD_SET_PIX_REG				2
diff --git a/src/commonregs.h b/src/commonregs.h
index 8958bf1..e472c53 100644
--- a/src/commonregs.h
+++ b/src/commonregs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/commonregs.h,v 1.1 1999/11/19 13:54:44 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1kregs.h,v 1.2 1999/04/17 07:06:34 dawes Exp $ */
 
 #ifndef __COMMONREGS_H__
 #define __COMMONREGS_H__
diff --git a/src/cscode.h b/src/cscode.h
index 7ffb578..f73a438 100644
--- a/src/cscode.h
+++ b/src/cscode.h
@@ -1,7 +1,7 @@
 /****************************************************************************\ 
  *       NOTE: This file generated automatically. Do not edit by hand!      *
 \****************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cscode.h,v 1.3 1999/10/13 04:21:19 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cscode.h,v 1.2 1999/04/17 07:06:31 dawes Exp $ */
 
 #ifndef __CSCODE_H__
 #define __CSCODE_H__
diff --git a/src/hwcursor.c b/src/hwcursor.c
index baf4c4d..e22e2f4 100644
--- a/src/hwcursor.c
+++ b/src/hwcursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c,v 1.8 2002/04/04 14:05:45 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c,v 1.6 2000/02/25 21:03:00 dawes Exp $ */
 /*
  * includes
  */
diff --git a/src/hwcursor.h b/src/hwcursor.h
index 1387858..38b444c 100644
--- a/src/hwcursor.h
+++ b/src/hwcursor.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.h,v 1.4 1999/11/19 13:54:45 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/vga256/drivers/rendition/hwcursor.h,v 1.1.2.2 1998/08/07 06:40:20 hohndel Exp $ */
 /*
  * file hwcursor.h
  */
diff --git a/src/rendition.c b/src/rendition.c
index 8d2946d..9173bc9 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c,v 1.59 2004/01/11 04:03:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c,v 1.58 2003/11/03 05:11:26 tsi Exp $ */
 /*
  * Copyright (C) 1998 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -228,7 +228,7 @@ static XF86ModuleVersionInfo renditionVersionRec = {
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     RENDITION_VERSION_MAJOR, RENDITION_VERSION_MINOR, RENDITION_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,
@@ -354,8 +354,8 @@ renditionProbe(DriverPtr drv, int flags)
 		foundScreen=TRUE;
 	    }
         }
+	xfree(usedChips);
     }
-    xfree(usedChips);
     return foundScreen;
 }
 
diff --git a/src/rendition.h b/src/rendition.h
index 3ec6726..44035d2 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.7 2001/05/16 06:48:10 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.5 2000/02/25 21:03:02 dawes Exp $ */
 
 #ifndef __RENDITION_H__
 #define __RENDITION_H__
diff --git a/src/rendition_options.h b/src/rendition_options.h
index c41db49..414a23f 100644
--- a/src/rendition_options.h
+++ b/src/rendition_options.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_options.h,v 1.5 2001/05/04 19:05:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_options.h,v 1.4 2000/03/01 00:25:24 dawes Exp $ */
 
 #ifndef __RENDITION_OPTION_H__
 #define __RENDITION_OPTION_H__
diff --git a/src/rendition_shadow.c b/src/rendition_shadow.c
index cf93af5..8ec4a0b 100644
--- a/src/rendition_shadow.c
+++ b/src/rendition_shadow.c
@@ -4,7 +4,7 @@
  * The functions used by ShadowFB
  * Based on code written by Mark Vojkovich <markv@valinux.com>
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_shadow.c,v 1.1 2000/03/01 00:25:25 dawes Exp $ */
+/* $XFree86$ */
 
 #include "rendition.h"
 #include "vtypes.h"
diff --git a/src/rendition_shadow.h b/src/rendition_shadow.h
index ec74463..19e4a5e 100644
--- a/src/rendition_shadow.h
+++ b/src/rendition_shadow.h
@@ -3,7 +3,7 @@
  *
  * headfile for rendition_shadow.c
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_shadow.h,v 1.1 2000/03/01 00:25:25 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef __RENDITION_SHADOW_H__
 #define __RENDITION_SHADOW_H__
diff --git a/src/v1kregs.h b/src/v1kregs.h
index af1817b..b2758b9 100644
--- a/src/v1kregs.h
+++ b/src/v1kregs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1kregs.h,v 1.4 1999/11/19 13:54:45 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1kregs.h,v 1.2 1999/04/17 07:06:34 dawes Exp $ */
 
 #ifndef __V1KREGS_H__
 #define __V1KREGS_H__
diff --git a/src/v1krisc.c b/src/v1krisc.c
index dc0a42d..0c18bae 100644
--- a/src/v1krisc.c
+++ b/src/v1krisc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c,v 1.7 2002/01/25 21:56:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c,v 1.6 2000/03/31 20:13:25 dawes Exp $ */
 /*
  *
  */
diff --git a/src/v1krisc.h b/src/v1krisc.h
index 7301129..e005a3a 100644
--- a/src/v1krisc.h
+++ b/src/v1krisc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.h,v 1.3 1999/10/13 04:21:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.h,v 1.2 1999/04/17 07:06:34 dawes Exp $ */
 /*
  * file v1krisc.h
  *
diff --git a/src/v2kregs.h b/src/v2kregs.h
index d2b66be..faadd6a 100644
--- a/src/v2kregs.h
+++ b/src/v2kregs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v2kregs.h,v 1.4 1999/11/19 13:54:46 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v2kregs.h,v 1.2 1999/04/17 07:06:34 dawes Exp $ */
 #ifndef __V2KREGS_H__
 #define __V2KREGS_H__
 
diff --git a/src/vboard.c b/src/vboard.c
index 95a8fbc..f38f7b3 100644
--- a/src/vboard.c
+++ b/src/vboard.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.19 2003/11/06 18:38:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.18tsi Exp $ */
 /*
  * includes
  */
diff --git a/src/vboard.h b/src/vboard.h
index ddda206..3de5aec 100644
--- a/src/vboard.h
+++ b/src/vboard.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h,v 1.6 2000/03/31 20:13:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h,v 1.5 2000/02/25 21:03:04 dawes Exp $ */
 
 /*
  * vboard.h
diff --git a/src/vgafont-std.data b/src/vgafont-std.data
index db63ea8..37a3b9c 100644
--- a/src/vgafont-std.data
+++ b/src/vgafont-std.data
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-std.data,v 1.3 1999/10/13 04:21:22 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-std.data,v 1.2 1999/04/17 07:06:37 dawes Exp $ */
 #ifndef __VGAFONT_STD__
 #define __VGAFONT_STD__
 
diff --git a/src/vgafont-vrx.data b/src/vgafont-vrx.data
index ad34582..9f99844 100644
--- a/src/vgafont-vrx.data
+++ b/src/vgafont-vrx.data
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-vrx.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-vrx.data,v 1.2 1999/04/17 07:06:38 dawes Exp $ */
 #ifndef __VGAFONT_VRX__
 #define __VGAFONT_VRX__
 
diff --git a/src/vgapalette.data b/src/vgapalette.data
index 5267608..b1926a1 100644
--- a/src/vgapalette.data
+++ b/src/vgapalette.data
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgapalette.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgapalette.data,v 1.2 1999/04/17 07:06:38 dawes Exp $ */
 #ifndef __VGAPALETTE__
 #define __VGAPALETTE__
 
diff --git a/src/vloaduc.c b/src/vloaduc.c
index 2b69969..a052ce8 100644
--- a/src/vloaduc.c
+++ b/src/vloaduc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.14 2003/11/06 18:38:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.13tsi Exp $ */
 /*
  * includes
  */
diff --git a/src/vloaduc.h b/src/vloaduc.h
index 0c127d1..e44f110 100644
--- a/src/vloaduc.h
+++ b/src/vloaduc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h,v 1.4 2000/03/31 20:13:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
 
 /*
  * file vloaduc.h
diff --git a/src/vmisc.c b/src/vmisc.c
index fec54ed..ac14cf0 100644
--- a/src/vmisc.c
+++ b/src/vmisc.c
@@ -1,5 +1,5 @@
 /* Misc routines used elsewhere in driver */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c,v 1.4 2000/03/31 20:13:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c,v 1.3 2000/02/25 21:03:05 dawes Exp $ */
 
 #include "rendition.h"
 #include "vtypes.h"
diff --git a/src/vmisc.h b/src/vmisc.h
index c104147..5e75ea0 100644
--- a/src/vmisc.h
+++ b/src/vmisc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h,v 1.3 2000/03/31 20:13:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h,v 1.2 1999/11/19 14:59:18 hohndel Exp $ */
 
 #ifndef __VMISC_H__
 #define __VMISC_H__
diff --git a/src/vmodes.c b/src/vmodes.c
index 57712d5..4c4336b 100644
--- a/src/vmodes.c
+++ b/src/vmodes.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c,v 1.14 2004/02/24 01:13:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c,v 1.13 2002/12/11 17:23:33 dawes Exp $ */
 /*
  * file vmodes.c
  *
diff --git a/src/vmodes.h b/src/vmodes.h
index 3cb8669..4f2c308 100644
--- a/src/vmodes.h
+++ b/src/vmodes.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h,v 1.5 2002/04/04 14:05:45 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h,v 1.3 1999/10/13 04:21:24 dawes Exp $ */
 /*
  * file vmodes.h
  *
diff --git a/src/vos.h b/src/vos.h
index e2ec54f..bcb75ab 100644
--- a/src/vos.h
+++ b/src/vos.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h,v 1.9 2002/01/25 21:56:07 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h,v 1.8 2000/03/31 20:13:28 dawes Exp $ */
 /*
  * file vos.h
  *
diff --git a/src/vramdac.c b/src/vramdac.c
index 850030c..f09d198 100644
--- a/src/vramdac.c
+++ b/src/vramdac.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c,v 1.19 2003/09/24 02:43:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c,v 1.18 2002/12/11 17:23:33 dawes Exp $ */
 /*
  * includes
  */
diff --git a/src/vramdac.h b/src/vramdac.h
index c7db3c1..ac29672 100644
--- a/src/vramdac.h
+++ b/src/vramdac.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h,v 1.6 2002/04/04 14:05:45 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h,v 1.4 2000/02/25 21:03:07 dawes Exp $ */
 /*
  * file vramdac.h
  *
diff --git a/src/vtypes.h b/src/vtypes.h
index cc0482a..e33f1fd 100644
--- a/src/vtypes.h
+++ b/src/vtypes.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h,v 1.10 2002/04/04 14:05:45 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h,v 1.8 2001/10/28 03:33:44 tsi Exp $ */
 #ifndef _VTYPES_H_
 #define _VTYPES_H_