Ident lines

78 files changed, 85 insertions, 27 deletions

diff --git a/extras/Mesa/src/FX/fxddtex.c b/extras/Mesa/src/FX/fxddtex.c
index 24a00a8ed..eb5ea0a03 100644
--- a/extras/Mesa/src/FX/fxddtex.c
+++ b/extras/Mesa/src/FX/fxddtex.c
@@ -41,7 +41,7 @@
  *
  * See fxapi.h for more revision/author details.
  */
-
+/* $XFree86$ */
 
 #ifdef HAVE_CONFIG_H
 #include "conf.h"
diff --git a/extras/Mesa/src/FX/fxtexman.c b/extras/Mesa/src/FX/fxtexman.c
index 5963a0db4..85cb6df4c 100644
--- a/extras/Mesa/src/FX/fxtexman.c
+++ b/extras/Mesa/src/FX/fxtexman.c
@@ -41,7 +41,7 @@
  *
  * See fxapi.h for more revision/author details.
  */
-
+/* $XFree86$ */
 
 /* fxtexman.c - 3Dfx VooDoo texture memory functions */
 
diff --git a/extras/Mesa/src/teximage.c b/extras/Mesa/src/teximage.c
index 98f62c816..41bfd9699 100644
--- a/extras/Mesa/src/teximage.c
+++ b/extras/Mesa/src/teximage.c
@@ -22,7 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
+/* $XFree86$ */
 
 #ifdef PC_HEADER
 #include "all.h"
diff --git a/extras/Mesa/src/vbrender.c b/extras/Mesa/src/vbrender.c
index dd1ae5159..9cbcf83d7 100644
--- a/extras/Mesa/src/vbrender.c
+++ b/extras/Mesa/src/vbrender.c
@@ -22,7 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
+/* $XFree86$ */
 
 /*
  * Render points, lines, and polygons.  The only entry point to this
diff --git a/lib/GL/makeprofile.sh b/lib/GL/makeprofile.sh
index 9cf2cd1d7..81c1daa00 100644
--- a/lib/GL/makeprofile.sh
+++ b/lib/GL/makeprofile.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $XFree86$
 
 libname=$1
 
diff --git a/lib/GL/mesa/src/drv/i810/i810_3d_reg.h b/lib/GL/mesa/src/drv/i810/i810_3d_reg.h
index bb19196ce..65d89b849 100644
--- a/lib/GL/mesa/src/drv/i810/i810_3d_reg.h
+++ b/lib/GL/mesa/src/drv/i810/i810_3d_reg.h
@@ -1,4 +1,4 @@
-
+/* $XFree86$ */
 
 #ifndef I810_3D_REG_H
 #define I810_3D_REG_H
diff --git a/lib/GL/mesa/src/drv/i810/i810context.h b/lib/GL/mesa/src/drv/i810/i810context.h
index d716e0e7c..9738190f2 100644
--- a/lib/GL/mesa/src/drv/i810/i810context.h
+++ b/lib/GL/mesa/src/drv/i810/i810context.h
@@ -21,7 +21,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-
+/* $XFree86$ */
 
 #ifndef I810CONTEXT_INC
 #define I810CONTEXT_INC
diff --git a/lib/GL/mesa/src/drv/i810/i810fastpath.c b/lib/GL/mesa/src/drv/i810/i810fastpath.c
index abffcb737..ed8f4a854 100644
--- a/lib/GL/mesa/src/drv/i810/i810fastpath.c
+++ b/lib/GL/mesa/src/drv/i810/i810fastpath.c
@@ -21,6 +21,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+/* $XFree86$ */
 
 #include <stdio.h>
 
diff --git a/lib/GL/mesa/src/drv/i810/i810ioctl.c b/lib/GL/mesa/src/drv/i810/i810ioctl.c
index 5826485bd..ad26e5224 100644
--- a/lib/GL/mesa/src/drv/i810/i810ioctl.c
+++ b/lib/GL/mesa/src/drv/i810/i810ioctl.c
@@ -1,7 +1,8 @@
+/* $XFree86$ */
+
 #include <stdio.h>
 #include <unistd.h>
 
-
 #include "types.h"
 #include "pb.h"
 #include "dd.h"
diff --git a/lib/GL/mesa/src/drv/i810/i810ioctl.h b/lib/GL/mesa/src/drv/i810/i810ioctl.h
index f44dc60fe..51ea4ef5a 100644
--- a/lib/GL/mesa/src/drv/i810/i810ioctl.h
+++ b/lib/GL/mesa/src/drv/i810/i810ioctl.h
@@ -1,3 +1,5 @@
+/* $XFree86$ */
+
 #ifndef MGA_IOCTL_H
 #define MGA_IOCTL_H
 
diff --git a/lib/GL/mesa/src/drv/i810/i810tris.c b/lib/GL/mesa/src/drv/i810/i810tris.c
index dab57e8d9..ff2ae77f6 100644
--- a/lib/GL/mesa/src/drv/i810/i810tris.c
+++ b/lib/GL/mesa/src/drv/i810/i810tris.c
@@ -22,6 +22,7 @@
  *
  *
  */
+/* $XFree86$ */
 
 #include <stdio.h>
 #include <math.h>
diff --git a/lib/GL/mesa/src/drv/i810/i810tris.h b/lib/GL/mesa/src/drv/i810/i810tris.h
index 8a17b4112..95a98f72d 100644
--- a/lib/GL/mesa/src/drv/i810/i810tris.h
+++ b/lib/GL/mesa/src/drv/i810/i810tris.h
@@ -22,6 +22,7 @@
  *
  *
  */
+/* $XFree86$ */
 
 #ifndef I810TRIS_INC
 #define I810TRIS_INC
diff --git a/lib/GL/mesa/src/drv/i810/i810tritmp.h b/lib/GL/mesa/src/drv/i810/i810tritmp.h
index 7eea0038d..4b11fa2c0 100644
--- a/lib/GL/mesa/src/drv/i810/i810tritmp.h
+++ b/lib/GL/mesa/src/drv/i810/i810tritmp.h
@@ -1,3 +1,4 @@
+/* $XFree86$ */
 
 static __inline void TAG(triangle)(GLcontext *ctx,
 				   GLuint e0, GLuint e1, GLuint e2,
diff --git a/lib/GL/mesa/src/drv/i810/i810vb.c b/lib/GL/mesa/src/drv/i810/i810vb.c
index 075063489..13b7114ff 100644
--- a/lib/GL/mesa/src/drv/i810/i810vb.c
+++ b/lib/GL/mesa/src/drv/i810/i810vb.c
@@ -22,6 +22,7 @@
  *
  *
  */
+/* $XFree86$ */
  
 #include "i810context.h"
 #include "i810vb.h"
diff --git a/lib/GL/mesa/src/drv/i810/i810vb.h b/lib/GL/mesa/src/drv/i810/i810vb.h
index b5553d791..b8ad58c8e 100644
--- a/lib/GL/mesa/src/drv/i810/i810vb.h
+++ b/lib/GL/mesa/src/drv/i810/i810vb.h
@@ -22,6 +22,7 @@
  *
  *
  */
+/* $XFree86$ */
 
 #ifndef I810VB_INC
 #define I810VB_INC
diff --git a/lib/GL/mesa/src/drv/mga/mga_xmesa.h b/lib/GL/mesa/src/drv/mga/mga_xmesa.h
index b9e464f1e..7d9da0322 100644
--- a/lib/GL/mesa/src/drv/mga/mga_xmesa.h
+++ b/lib/GL/mesa/src/drv/mga/mga_xmesa.h
@@ -24,6 +24,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
+/* $XFree86$ */
 
 /*
  * Authors:
diff --git a/lib/GL/mesa/src/drv/mga/mgaeltpath.c b/lib/GL/mesa/src/drv/mga/mgaeltpath.c
index 0417d332b..74a1bf683 100644
--- a/lib/GL/mesa/src/drv/mga/mgaeltpath.c
+++ b/lib/GL/mesa/src/drv/mga/mgaeltpath.c
@@ -21,6 +21,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+/* $XFree86$ */
 
 #include <stdio.h>
 
diff --git a/lib/GL/mesa/src/drv/mga/mgaelttmp.h b/lib/GL/mesa/src/drv/mga/mgaelttmp.h
index 8a5328226..3973228bb 100644
--- a/lib/GL/mesa/src/drv/mga/mgaelttmp.h
+++ b/lib/GL/mesa/src/drv/mga/mgaelttmp.h
@@ -21,6 +21,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+/* $XFree86$ */
 
 /* Buffers fill from high addresses down with vertices and from low
  * addresses up with elements.  
diff --git a/lib/GL/mesa/src/drv/mga/mgafastpath.c b/lib/GL/mesa/src/drv/mga/mgafastpath.c
index 1049cc80d..abb85481d 100644
--- a/lib/GL/mesa/src/drv/mga/mgafastpath.c
+++ b/lib/GL/mesa/src/drv/mga/mgafastpath.c
@@ -21,6 +21,7 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
+/* $XFree86$ */
 
 #include <stdio.h>
 
diff --git a/lib/GL/mesa/src/drv/mga/mgaioctl.c b/lib/GL/mesa/src/drv/mga/mgaioctl.c
index 556bcc047..2a4d41887 100644
--- a/lib/GL/mesa/src/drv/mga/mgaioctl.c
+++ b/lib/GL/mesa/src/drv/mga/mgaioctl.c
@@ -1,5 +1,6 @@
-#include <stdio.h>
+/* $XFree86$ */
 
+#include <stdio.h>
 
 #include "types.h"
 #include "pb.h"
diff --git a/lib/GL/mesa/src/drv/mga/mgaioctl.h b/lib/GL/mesa/src/drv/mga/mgaioctl.h
index 96be18ee1..12ee83eb6 100644
--- a/lib/GL/mesa/src/drv/mga/mgaioctl.h
+++ b/lib/GL/mesa/src/drv/mga/mgaioctl.h
@@ -1,3 +1,5 @@
+/* $XFree86$ */
+
 #ifndef MGA_IOCTL_H
 #define MGA_IOCTL_H
 
diff --git a/lib/GL/mesa/src/drv/mga/mgalib.h b/lib/GL/mesa/src/drv/mga/mgalib.h
index a913904b4..7b3252c9b 100644
--- a/lib/GL/mesa/src/drv/mga/mgalib.h
+++ b/lib/GL/mesa/src/drv/mga/mgalib.h
@@ -23,7 +23,7 @@
  *
  *    Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de>
  */
-
+/* $XFree86$ */
 
 #ifndef MGALIB_INC
 #define MGALIB_INC
diff --git a/lib/GL/mesa/src/drv/mga/mgaspan.c b/lib/GL/mesa/src/drv/mga/mgaspan.c
index c3cc38482..97dd54514 100644
--- a/lib/GL/mesa/src/drv/mga/mgaspan.c
+++ b/lib/GL/mesa/src/drv/mga/mgaspan.c
@@ -1,3 +1,5 @@
+/* $XFree86$ */
+
 #include "types.h"
 #include "mgadd.h"
 #include "mgalib.h"
diff --git a/lib/GL/mesa/src/drv/mga/mgatris.c b/lib/GL/mesa/src/drv/mga/mgatris.c
index 2942cec7e..96e38ec1f 100644
--- a/lib/GL/mesa/src/drv/mga/mgatris.c
+++ b/lib/GL/mesa/src/drv/mga/mgatris.c
@@ -23,6 +23,7 @@
  *
  *    Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de>
  */
+/* $XFree86$ */
 
 #include <stdio.h>
 #include <math.h>
diff --git a/lib/GL/mesa/src/drv/mga/mgatris.h b/lib/GL/mesa/src/drv/mga/mgatris.h
index bbebbc400..5da20e6ce 100644
--- a/lib/GL/mesa/src/drv/mga/mgatris.h
+++ b/lib/GL/mesa/src/drv/mga/mgatris.h
@@ -23,6 +23,7 @@
  *
  *    Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de>
  */
+/* $XFree86$ */
 
 #ifndef MGATIS_INC
 #define MGATIS_INC
diff --git a/lib/GL/mesa/src/drv/mga/mgatritmp.h b/lib/GL/mesa/src/drv/mga/mgatritmp.h
index 4146da97a..03901443b 100644
--- a/lib/GL/mesa/src/drv/mga/mgatritmp.h
+++ b/lib/GL/mesa/src/drv/mga/mgatritmp.h
@@ -1,3 +1,4 @@
+/* $XFree86$ */
 
 static __inline void TAG(triangle)(GLcontext *ctx,
 				   GLuint e0, GLuint e1, GLuint e2,
diff --git a/lib/GL/mesa/src/drv/mga/mgavb.c b/lib/GL/mesa/src/drv/mga/mgavb.c
index 2bab665a5..c0a74ced6 100644
--- a/lib/GL/mesa/src/drv/mga/mgavb.c
+++ b/lib/GL/mesa/src/drv/mga/mgavb.c
@@ -23,6 +23,7 @@
  *
  *    Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de>
  */
+/* $XFree86$ */
  
 #include "mgalib.h"
 #include "mgavb.h"
diff --git a/lib/GL/mesa/src/drv/mga/mgavb.h b/lib/GL/mesa/src/drv/mga/mgavb.h
index e8926ba1f..7af1daf12 100644
--- a/lib/GL/mesa/src/drv/mga/mgavb.h
+++ b/lib/GL/mesa/src/drv/mga/mgavb.h
@@ -23,6 +23,7 @@
  *
  *    Wittawat Yamwong <Wittawat.Yamwong@stud.uni-hannover.de>
  */
+/* $XFree86$ */
 
 #ifndef MGAVB_INC
 #define MGAVB_INC
diff --git a/lib/Xrender/Composite.c b/lib/Xrender/Composite.c
index 3c29b2d5f..b2c65db50 100644
--- a/lib/Xrender/Composite.c
+++ b/lib/Xrender/Composite.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/lib/Xrender/Glyph.c b/lib/Xrender/Glyph.c
index cfd0d1335..217a3bb6c 100644
--- a/lib/Xrender/Glyph.c
+++ b/lib/Xrender/Glyph.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/lib/Xrender/Picture.c b/lib/Xrender/Picture.c
index 5b6787993..59b9aaa1d 100644
--- a/lib/Xrender/Picture.c
+++ b/lib/Xrender/Picture.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/lib/Xrender/Xrender.c b/lib/Xrender/Xrender.c
index a0bdda11e..6294012fd 100644
--- a/lib/Xrender/Xrender.c
+++ b/lib/Xrender/Xrender.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/lib/Xrender/Xrender.h b/lib/Xrender/Xrender.h
index ab47b679e..c65b9d46a 100644
--- a/lib/Xrender/Xrender.h
+++ b/lib/Xrender/Xrender.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/lib/Xrender/Xrenderint.h b/lib/Xrender/Xrenderint.h
index a1b8780fb..e366c8c07 100644
--- a/lib/Xrender/Xrenderint.h
+++ b/lib/Xrender/Xrenderint.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/Xserver/hw/kdrive/kpict.c b/programs/Xserver/hw/kdrive/kpict.c
index 54dfda1f0..2c5483efe 100644
--- a/programs/Xserver/hw/kdrive/kpict.c
+++ b/programs/Xserver/hw/kdrive/kpict.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 1999 Keith Packard
  *
diff --git a/programs/Xserver/hw/kdrive/linux/linux.c b/programs/Xserver/hw/kdrive/linux/linux.c
index 200bb896a..2cd54d53b 100644
--- a/programs/Xserver/hw/kdrive/linux/linux.c
+++ b/programs/Xserver/hw/kdrive/linux/linux.c
@@ -1,5 +1,5 @@
 /*
- * Id: linux.c,v 1.2 1999/11/23 04:21:09 keithp Exp $
+ * $XFree86$
  *
  * Copyright © 1999 Keith Packard
  *
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel
index b1b8d9768..9f8b702db 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel
@@ -1,3 +1,4 @@
+# $XFree86$
 #
 # Makefile for the drm device driver.  This driver provides support for
 # the Direct Rendering Infrastructure (DRI) in XFree86 4.x.
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/README.drm b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/README.drm
index 6441e01e5..b48b7b677 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/README.drm
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/README.drm
@@ -1,3 +1,5 @@
+/* $XFree86$ */
+
 ************************************************************
 * For the very latest on DRI development, please see:      *
 *     http://dri.sourceforge.net/                          *
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c
index 42a1bc2f6..6a9f78c23 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/agpsupport.c
@@ -28,6 +28,8 @@
  *
  */
 
+/* $XFree86$ */
+
 #define __NO_VERSION__
 #include "drmP.h"
 #include <linux/module.h>
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c
index 4556bd966..a58bdd01c 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/auth.c
@@ -28,6 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c
index c00f051a8..66bfc19e4 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/bufs.c
@@ -28,6 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include <linux/config.h>
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h
index aa9bc01a5..e47c0892e 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/drmP.h
@@ -28,6 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  * 
  */
+/* $XFree86$ */
 
 #ifndef _DRM_P_H_
 #define _DRM_P_H_
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c
index f3966d96b..a839a6d9c 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/fops.c
@@ -29,6 +29,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c
index 13d37c245..5d4c3ba9b 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.c
@@ -28,6 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #include <linux/config.h>
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h
index e9ce39589..e50fb3f7a 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/gamma_drv.h
@@ -28,6 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  * 
  */
+/* $XFree86$ */
 
 #ifndef _GAMMA_DRV_H_
 #define _GAMMA_DRV_H_
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_context.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_context.c
index 85c0877b6..5dd440cb9 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_context.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_context.c
@@ -28,6 +28,7 @@
  *	    Jeff Hartmann <jhartmann@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c
index 19b7bd928..1a8290dfa 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_dma.c
@@ -29,6 +29,7 @@
  *          Keith Whitwell <keithw@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c
index 275663a1b..3dc5c6afa 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.c
@@ -28,6 +28,7 @@
  *	    Jeff Hartmann <jhartmann@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #include <linux/config.h>
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h
index 1c9574017..5586a6a64 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/i810_drv.h
@@ -28,6 +28,7 @@
  * 	    Jeff Hartmann <jhartmann@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #ifndef _I810_DRV_H_
 #define _I810_DRV_H_
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c
index 8de3dac9b..981895807 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/init.c
@@ -28,6 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c
index 5da7cc6c5..2850d3b37 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/lists.c
@@ -28,6 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c
index 34d19b203..3416698a3 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/memory.c
@@ -28,6 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include <linux/config.h>
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c
index 9a73e6c14..004fec142 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_context.c
@@ -28,6 +28,7 @@
  *	   Jeff Hartmann <jhartmann@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c
index 0df0906e5..1a1041a32 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_dma.c
@@ -29,6 +29,7 @@
  *	    Keith Whitwell <keithw@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c
index acc42b833..ab1bc1278 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.c
@@ -29,6 +29,7 @@
  *
  *
  */
+/* $XFree86$ */
 
 #include <linux/config.h>
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h
index f49bd0f6c..8ba772249 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_drv.h
@@ -28,6 +28,7 @@
  * 	    Jeff Hartmann <jhartmann@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #ifndef _MGA_DRV_H_
 #define _MGA_DRV_H_
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c
index 2e808e8c0..45e938681 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/mga_state.c
@@ -28,6 +28,7 @@
  * 	    Keith Whitwell <keithw@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c
index ca062a09b..25822fd54 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/proc.c
@@ -27,6 +27,7 @@
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_bufs.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_bufs.c
index bd81dcdc0..19e389de1 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_bufs.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_bufs.c
@@ -29,6 +29,7 @@
  *	    Jeff Hartmann <jhartmann@valinux.com>
  * 
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include <linux/config.h>
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_context.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_context.c
index 2dd716d4b..a0df4d697 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_context.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_context.c
@@ -27,6 +27,7 @@
  * Author: Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c
index fac882471..9d768ce13 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.c
@@ -28,6 +28,7 @@
  *          Kevin E. Martin <martin@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #include <linux/config.h>
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h
index 5b15dddfb..2e17ed1cd 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h
@@ -28,6 +28,7 @@
  *          Kevin E. Martin <martin@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #ifndef _R128_DRV_H_
 #define _R128_DRV_H_
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c
index c04561ee1..16257d1b2 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/sis_drv.c
@@ -28,6 +28,7 @@
  *    Daryll Strauss <daryll@precisioninsight.com>
  *
  */
+/* $XFree86$ */
 
 #include <linux/config.h>
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c
index d6903c0ae..6371cfc48 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_context.c
@@ -29,6 +29,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  * 
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c
index 59f101970..9cc3c9930 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.c
@@ -29,6 +29,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #include <linux/config.h>
 #include "drmP.h"
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h
index bee840e19..a5cef6523 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/tdfx_drv.h
@@ -29,6 +29,7 @@
  *    Daryll Strauss <daryll@valinux.com>
  * 
  */
+/* $XFree86$ */
 
 #ifndef _TDFX_DRV_H_
 #define _TDFX_DRV_H_
diff --git a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c
index 7c5a24bc9..90d7770f6 100644
--- a/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c
+++ b/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/vm.c
@@ -28,6 +28,7 @@
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
  */
+/* $XFree86$ */
 
 #define __NO_VERSION__
 #include "drmP.h"
diff --git a/programs/Xserver/render/fbpict.c b/programs/Xserver/render/fbpict.c
index 6f7db3adb..a5dc915e6 100644
--- a/programs/Xserver/render/fbpict.c
+++ b/programs/Xserver/render/fbpict.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/Xserver/render/glyph.c b/programs/Xserver/render/glyph.c
index df5904176..37149c46e 100644
--- a/programs/Xserver/render/glyph.c
+++ b/programs/Xserver/render/glyph.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/Xserver/render/glyphstr.h b/programs/Xserver/render/glyphstr.h
index 764e0a0e2..d426eb936 100644
--- a/programs/Xserver/render/glyphstr.h
+++ b/programs/Xserver/render/glyphstr.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/Xserver/render/miglyph.c b/programs/Xserver/render/miglyph.c
index 75fee43b4..67c3164e5 100644
--- a/programs/Xserver/render/miglyph.c
+++ b/programs/Xserver/render/miglyph.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/Xserver/render/mipict.c b/programs/Xserver/render/mipict.c
index f7dae752d..c6a5a5255 100644
--- a/programs/Xserver/render/mipict.c
+++ b/programs/Xserver/render/mipict.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 1999 Keith Packard
  *
diff --git a/programs/Xserver/render/mipict.h b/programs/Xserver/render/mipict.h
index fce3eca97..4d3abb6d6 100644
--- a/programs/Xserver/render/mipict.h
+++ b/programs/Xserver/render/mipict.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/Xserver/render/picture.c b/programs/Xserver/render/picture.c
index 847919ed8..79d30b4c4 100644
--- a/programs/Xserver/render/picture.c
+++ b/programs/Xserver/render/picture.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/Xserver/render/picture.h b/programs/Xserver/render/picture.h
index 3a4f6b9f5..13afdd6cf 100644
--- a/programs/Xserver/render/picture.h
+++ b/programs/Xserver/render/picture.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/Xserver/render/picturestr.h b/programs/Xserver/render/picturestr.h
index a6cdf64d2..a3ca2a161 100644
--- a/programs/Xserver/render/picturestr.h
+++ b/programs/Xserver/render/picturestr.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/Xserver/render/render.c b/programs/Xserver/render/render.c
index 95325a0ba..8c8f442c8 100644
--- a/programs/Xserver/render/render.c
+++ b/programs/Xserver/render/render.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $XFree86$
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/programs/xkbcomp/compat.c b/programs/xkbcomp/compat.c
index e26cc19c0..2d5edbf0a 100644
--- a/programs/xkbcomp/compat.c
+++ b/programs/xkbcomp/compat.c
@@ -24,6 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
+/* $XFree86$ */
 
 #include <X11/Xos.h>
 #include "xkbcomp.h"