Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

80 files changed, 85 insertions, 84 deletions

diff --git a/man/nsc.man b/man/nsc.man
index f5a5f6f..d9addac 100644
--- a/man/nsc.man
+++ b/man/nsc.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.man,v 1.2 2003/05/29 21:48:09 herrb Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.man,v 1.1 2002/12/10 15:12:23 alanh Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH NSC __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ nsc \- Nsc video driver
 .fi
 .SH DESCRIPTION
 .B nsc
-is an XFree86 driver for National Semiconductors GEODE processor family.
+is an __xservername__ driver for National Semiconductors GEODE processor family.
 It uses the DURANGO kit provided by National Semiconductor.
 The driver is accelerated, and provides support for the following 
 framebuffer depths: 8, 16 and 24.
@@ -24,7 +24,7 @@ The
 driver supports GXLV (5530 companion chip), SC1200, SC1400 and
 GX2 (5535 companion chip).
 .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
@@ -129,6 +129,6 @@ view on TV. The parameters xx: X-offset, yy: Y-offset, ww: Viewable width,
 hh: Viewable height.
 Default: no TV.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHOR
 Author: Sarma V. Kolluru
diff --git a/src/durango.c b/src/durango.c
index 8033f52..94c5795 100644
--- a/src/durango.c
+++ b/src/durango.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/durango.c,v 1.5 2003/01/24 17:16:52 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/durango.c,v 1.4 2003/01/14 09:34:30 alanh Exp $ */
 /*
  * $Workfile: durango.c $
  * $Revision$
diff --git a/src/gfx/disp_gu1.c b/src/gfx/disp_gu1.c
index 858ae9a..531bc47 100644
--- a/src/gfx/disp_gu1.c
+++ b/src/gfx/disp_gu1.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu1.c,v 1.5 2004/01/27 17:31:59 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu1.c,v 1.4 2003/02/06 17:46:02 alanh Exp $ */
 /*
  * $Workfile: disp_gu1.c $
  *
diff --git a/src/gfx/disp_gu2.c b/src/gfx/disp_gu2.c
index c0aab15..94ed470 100644
--- a/src/gfx/disp_gu2.c
+++ b/src/gfx/disp_gu2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu2.c,v 1.5 2003/11/03 05:11:22 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/disp_gu2.c,v 1.4tsi Exp $ */
 /*
  * $Workfile: disp_gu2.c $
  *
diff --git a/src/gfx/durango.c b/src/gfx/durango.c
index 56bc65a..b43acd0 100644
--- a/src/gfx/durango.c
+++ b/src/gfx/durango.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/durango.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: durango.c $
  *
diff --git a/src/gfx/gfx_dcdr.c b/src/gfx/gfx_dcdr.c
index 187b440..e416016 100644
--- a/src/gfx/gfx_dcdr.c
+++ b/src/gfx/gfx_dcdr.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_dcdr.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_dcdr.c $
  *
diff --git a/src/gfx/gfx_defs.h b/src/gfx/gfx_defs.h
index 42df074..d3a38eb 100644
--- a/src/gfx/gfx_defs.h
+++ b/src/gfx/gfx_defs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_defs.h,v 1.3 2003/11/03 05:11:23 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_defs.h,v 1.2tsi Exp $ */
 /*
  * $Workfile: gfx_defs.h $
  *
diff --git a/src/gfx/gfx_disp.c b/src/gfx/gfx_disp.c
index 54adcb3..02faa92 100644
--- a/src/gfx/gfx_disp.c
+++ b/src/gfx/gfx_disp.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_disp.c,v 1.2 2003/01/14 09:34:34 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_disp.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_disp.c $
  *
diff --git a/src/gfx/gfx_i2c.c b/src/gfx/gfx_i2c.c
index 385ee9f..424b0c7 100644
--- a/src/gfx/gfx_i2c.c
+++ b/src/gfx/gfx_i2c.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_i2c.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_i2c.c $
  *
diff --git a/src/gfx/gfx_init.c b/src/gfx/gfx_init.c
index 2aa93d5..9c576e6 100644
--- a/src/gfx/gfx_init.c
+++ b/src/gfx/gfx_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_init.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_init.c $
  *
diff --git a/src/gfx/gfx_mode.h b/src/gfx/gfx_mode.h
index 100b36c..73d5dbe 100644
--- a/src/gfx/gfx_mode.h
+++ b/src/gfx/gfx_mode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_mode.h,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_mode.h $
  *
diff --git a/src/gfx/gfx_msr.c b/src/gfx/gfx_msr.c
index c6b1caf..47ce580 100644
--- a/src/gfx/gfx_msr.c
+++ b/src/gfx/gfx_msr.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_msr.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_msr.c $
  *
diff --git a/src/gfx/gfx_regs.h b/src/gfx/gfx_regs.h
index 7b11887..a1cfd9f 100644
--- a/src/gfx/gfx_regs.h
+++ b/src/gfx/gfx_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_regs.h,v 1.2 2003/02/05 18:38:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_regs.h,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: gfx_regs.h $
  *
diff --git a/src/gfx/gfx_rndr.c b/src/gfx/gfx_rndr.c
index 5b6b881..9b8aefb 100644
--- a/src/gfx/gfx_rndr.c
+++ b/src/gfx/gfx_rndr.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_rndr.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_rndr.c $
  *
diff --git a/src/gfx/gfx_rtns.h b/src/gfx/gfx_rtns.h
index aefd6c0..5451eea 100644
--- a/src/gfx/gfx_rtns.h
+++ b/src/gfx/gfx_rtns.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_rtns.h,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_rtns.h $
  *
diff --git a/src/gfx/gfx_tv.c b/src/gfx/gfx_tv.c
index 6cb825d..61e0aae 100644
--- a/src/gfx/gfx_tv.c
+++ b/src/gfx/gfx_tv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_tv.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_tv.c $
  *
diff --git a/src/gfx/gfx_tv.h b/src/gfx/gfx_tv.h
index 430c8a5..e920cc5 100644
--- a/src/gfx/gfx_tv.h
+++ b/src/gfx/gfx_tv.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_tv.h,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
+/* $XFree86$ */
 
 typedef struct tagTVDISPLAYMODE
 {
diff --git a/src/gfx/gfx_type.h b/src/gfx/gfx_type.h
index a50d5bd..8694e0f 100644
--- a/src/gfx/gfx_type.h
+++ b/src/gfx/gfx_type.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_type.h,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_type.h $
  *
diff --git a/src/gfx/gfx_vga.c b/src/gfx/gfx_vga.c
index a2c0dd6..ace602d 100644
--- a/src/gfx/gfx_vga.c
+++ b/src/gfx/gfx_vga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_vga.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_vga.c $
  *
diff --git a/src/gfx/gfx_vid.c b/src/gfx/gfx_vid.c
index 9ddde27..3889718 100644
--- a/src/gfx/gfx_vid.c
+++ b/src/gfx/gfx_vid.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_vid.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_vid.c $
  *
diff --git a/src/gfx/gfx_vip.c b/src/gfx/gfx_vip.c
index 1f506ae..080c18a 100644
--- a/src/gfx/gfx_vip.c
+++ b/src/gfx/gfx_vip.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/gfx_vip.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: gfx_vip.c $
  *
diff --git a/src/gfx/history.h b/src/gfx/history.h
index 36f7fb9..62d6a17 100644
--- a/src/gfx/history.h
+++ b/src/gfx/history.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/history.h,v 1.2 2003/02/05 18:38:43 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/history.h,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
 /*
  * $Workfile: history.h $
  *
diff --git a/src/gfx/i2c_acc.c b/src/gfx/i2c_acc.c
index 2ffd89b..bb9d8e5 100644
--- a/src/gfx/i2c_acc.c
+++ b/src/gfx/i2c_acc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/i2c_acc.c,v 1.2 2003/11/03 05:11:23 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/i2c_acc.c,v 1.1tsi Exp $ */
 /*
  * $Workfile: i2c_acc.c $
  *
diff --git a/src/gfx/i2c_gpio.c b/src/gfx/i2c_gpio.c
index 096750d..e9c6669 100644
--- a/src/gfx/i2c_gpio.c
+++ b/src/gfx/i2c_gpio.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/i2c_gpio.c,v 1.1 2002/12/10 15:12:26 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: i2c_gpio.c $
  *
diff --git a/src/gfx/init_gu1.c b/src/gfx/init_gu1.c
index 09fb79c..29fc68a 100644
--- a/src/gfx/init_gu1.c
+++ b/src/gfx/init_gu1.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/init_gu1.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: init_gu1.c $
  *
diff --git a/src/gfx/init_gu2.c b/src/gfx/init_gu2.c
index 143ce52..4eee209 100644
--- a/src/gfx/init_gu2.c
+++ b/src/gfx/init_gu2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/init_gu2.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: init_gu2.c $
  *
diff --git a/src/gfx/msr_rdcl.c b/src/gfx/msr_rdcl.c
index ce3ce05..66c6462 100644
--- a/src/gfx/msr_rdcl.c
+++ b/src/gfx/msr_rdcl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/msr_rdcl.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: msr_rdcl.c $
  *
diff --git a/src/gfx/release.txt b/src/gfx/release.txt
index 8d0c87f..7b495bb 100644
--- a/src/gfx/release.txt
+++ b/src/gfx/release.txt
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/release.txt,v 1.3 2003/02/06 17:46:02 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/release.txt,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 Durango Release Notes
 Version 2.49.01
 Win98/WinXP/DOS/Linux
diff --git a/src/gfx/rndr_gu1.c b/src/gfx/rndr_gu1.c
index 6d71f59..12ace2f 100644
--- a/src/gfx/rndr_gu1.c
+++ b/src/gfx/rndr_gu1.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/rndr_gu1.c,v 1.2 2003/01/14 09:34:34 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/rndr_gu1.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: rndr_gu1.c $
  *
diff --git a/src/gfx/rndr_gu2.c b/src/gfx/rndr_gu2.c
index 9378328..a75dcae 100644
--- a/src/gfx/rndr_gu2.c
+++ b/src/gfx/rndr_gu2.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/rndr_gu2.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: rndr_gu2.c $
  *
diff --git a/src/gfx/saa7114.c b/src/gfx/saa7114.c
index 885e65f..26bed27 100644
--- a/src/gfx/saa7114.c
+++ b/src/gfx/saa7114.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/saa7114.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: saa7114.c $
  *
diff --git a/src/gfx/tv_1200.c b/src/gfx/tv_1200.c
index 512b28e..bada406 100644
--- a/src/gfx/tv_1200.c
+++ b/src/gfx/tv_1200.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_1200.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: tv_1200.c $
  *
diff --git a/src/gfx/tv_fs450.c b/src/gfx/tv_fs450.c
index b14bc16..e109a62 100644
--- a/src/gfx/tv_fs450.c
+++ b/src/gfx/tv_fs450.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs450.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: tv_fs450.c $
  *
diff --git a/src/gfx/tv_fs450.h b/src/gfx/tv_fs450.h
index 2b87710..7eb15da 100644
--- a/src/gfx/tv_fs450.h
+++ b/src/gfx/tv_fs450.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs450.h,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: tv_fs450.h $
  *
diff --git a/src/gfx/tv_fs451.c b/src/gfx/tv_fs451.c
index d4e3fd2..29b74f2 100644
--- a/src/gfx/tv_fs451.c
+++ b/src/gfx/tv_fs451.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs451.c,v 1.2 2003/11/03 05:11:23 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_fs451.c,v 1.1tsi Exp $ */
 /*
  * $Workfile: tv_fs451.c $
  * $Revision$
diff --git a/src/gfx/tv_geode.c b/src/gfx/tv_geode.c
index 1938083..af25930 100644
--- a/src/gfx/tv_geode.c
+++ b/src/gfx/tv_geode.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/tv_geode.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*-----------------------------------------------------------------------------
  * TV_GEODE.C
  *
diff --git a/src/gfx/vga_gu1.c b/src/gfx/vga_gu1.c
index d5fa263..d8cbdce 100644
--- a/src/gfx/vga_gu1.c
+++ b/src/gfx/vga_gu1.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vga_gu1.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: vga_gu1.c $
  *
diff --git a/src/gfx/vid_1200.c b/src/gfx/vid_1200.c
index f52d02b..e25dc7e 100644
--- a/src/gfx/vid_1200.c
+++ b/src/gfx/vid_1200.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_1200.c,v 1.2 2003/01/14 09:34:34 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_1200.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: vid_1200.c $
  *
diff --git a/src/gfx/vid_1400.c b/src/gfx/vid_1400.c
index 11f9361..3ca83ba 100644
--- a/src/gfx/vid_1400.c
+++ b/src/gfx/vid_1400.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_1400.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*-----------------------------------------------------------------------------
  * VID_1400.C
  *
diff --git a/src/gfx/vid_5530.c b/src/gfx/vid_5530.c
index 17d5f3b..114973a 100644
--- a/src/gfx/vid_5530.c
+++ b/src/gfx/vid_5530.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_5530.c,v 1.2 2003/02/21 16:51:10 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_5530.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
 /*
  * $Workfile: vid_5530.c $
  *
diff --git a/src/gfx/vid_rdcl.c b/src/gfx/vid_rdcl.c
index b6dbc35..4712b78 100644
--- a/src/gfx/vid_rdcl.c
+++ b/src/gfx/vid_rdcl.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_rdcl.c,v 1.4 2003/11/03 05:11:23 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vid_rdcl.c,v 1.3tsi Exp $ */
 /*
  * $Workfile: vid_rdcl.c $
  *
diff --git a/src/gfx/vip_1200.c b/src/gfx/vip_1200.c
index f2458f6..f0681ba 100644
--- a/src/gfx/vip_1200.c
+++ b/src/gfx/vip_1200.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vip_1200.c,v 1.1 2002/12/10 15:12:27 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: vip_1200.c $
  *
diff --git a/src/gfx/vip_1400.c b/src/gfx/vip_1400.c
index 7896288..876479d 100644
--- a/src/gfx/vip_1400.c
+++ b/src/gfx/vip_1400.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/gfx/vip_1400.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
+/* $XFree86$ */
 /*-----------------------------------------------------------------------------
  * VIP_1400.C
  *
diff --git a/src/nsc.h b/src/nsc.h
index 3d57d19..2500cfc 100644
--- a/src/nsc.h
+++ b/src/nsc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.h,v 1.6 2003/11/03 05:11:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc.h,v 1.5tsi Exp $ */
 /*
  * $Workfile: nsc.h $
  * $Revision$
diff --git a/src/nsc_driver.c b/src/nsc_driver.c
index da856c6..e312683 100644
--- a/src/nsc_driver.c
+++ b/src/nsc_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_driver.c,v 1.5 2003/04/23 21:51:41 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_driver.c,v 1.4tsi Exp $ */
 /*
  * $Workfile: nsc_driver.c $
  * $Revision$
@@ -398,7 +398,7 @@ static XF86ModuleVersionInfo NscVersionRec = {
    MODULEVENDORSTRING,
    MODINFOSTRING1,
    MODINFOSTRING2,
-   XF86_VERSION_CURRENT,
+   XORG_VERSION_CURRENT,
    NSC_VERSION_MAJOR, NSC_VERSION_MINOR, NSC_PATCHLEVEL,
    ABI_CLASS_VIDEODRV,			/* This is a video driver */
    ABI_VIDEODRV_VERSION,
diff --git a/src/nsc_fourcc.h b/src/nsc_fourcc.h
index 321eb83..dbb9a72 100644
--- a/src/nsc_fourcc.h
+++ b/src/nsc_fourcc.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_fourcc.h,v 1.2 2003/01/14 09:34:30 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_fourcc.h,v 1.1 2002/12/10 15:12:23 alanh Exp $ */
 /*
  * $Workfile: nsc_fourcc.h $
  * $Revision$
diff --git a/src/nsc_galfns.c b/src/nsc_galfns.c
index 83a364b..9666c8e 100644
--- a/src/nsc_galfns.c
+++ b/src/nsc_galfns.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galfns.c,v 1.3 2003/02/05 18:38:42 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galfns.c,v 1.2 2003/01/14 09:34:30 alanh Exp $ */
 /*
  * $Workfile: nsc_galfns.c $
  * $Revision$
diff --git a/src/nsc_galstub.c b/src/nsc_galstub.c
index 5366f27..7cd3a7b 100644
--- a/src/nsc_galstub.c
+++ b/src/nsc_galstub.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galstub.c,v 1.2 2003/01/14 09:34:31 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_galstub.c,v 1.1 2002/12/10 15:12:23 alanh Exp $ */
 /*
  * $Workfile: nsc_galstub.c $
  * $Revision$
diff --git a/src/nsc_gx1_accel.c b/src/nsc_gx1_accel.c
index 1a1244b..46f8dfb 100644
--- a/src/nsc_gx1_accel.c
+++ b/src/nsc_gx1_accel.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.8 2003/12/07 23:18:16 alanh Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.8 2003/12/07 23:18:16 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.7 2003/12/07 22:40:38 alanh Exp $ */
 /*
  * $Workfile: nsc_gx1_accel.c $
  * $Revision$
diff --git a/src/nsc_gx1_cursor.c b/src/nsc_gx1_cursor.c
index dcf785a..5cd4a40 100644
--- a/src/nsc_gx1_cursor.c
+++ b/src/nsc_gx1_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_cursor.c,v 1.6 2003/11/03 05:11:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_cursor.c,v 1.5tsi Exp $ */
 /*
  * $Workfile: nsc_gx1_cursor.c $
  * $Revision$
diff --git a/src/nsc_gx1_dga.c b/src/nsc_gx1_dga.c
index 9d2f7b4..d3144ff 100644
--- a/src/nsc_gx1_dga.c
+++ b/src/nsc_gx1_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_dga.c,v 1.2 2003/01/14 09:34:31 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_dga.c,v 1.1 2002/12/10 15:12:23 alanh Exp $ */
 /*
  * $Workfile: nsc_gx1_dga.c $
  * $Revision$
diff --git a/src/nsc_gx1_driver.c b/src/nsc_gx1_driver.c
index cf1c308..4cc852e 100644
--- a/src/nsc_gx1_driver.c
+++ b/src/nsc_gx1_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_driver.c,v 1.11 2003/11/03 05:11:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_driver.c,v 1.10tsi Exp $ */
 /*
  * $Workfile: nsc_gx1_driver.c $
  * $Revision$
diff --git a/src/nsc_gx1_shadow.c b/src/nsc_gx1_shadow.c
index d3a139f..68899cb 100644
--- a/src/nsc_gx1_shadow.c
+++ b/src/nsc_gx1_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_shadow.c,v 1.2 2003/01/14 09:34:32 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_shadow.c,v 1.1 2002/12/10 15:12:23 alanh Exp $ */
 /*
  * $Workfile: nsc_gx1_shadow.c $
  * $Revision$
diff --git a/src/nsc_gx1_video.c b/src/nsc_gx1_video.c
index e220035..06e671e 100644
--- a/src/nsc_gx1_video.c
+++ b/src/nsc_gx1_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c,v 1.8 2003/11/10 18:22:23 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_video.c,v 1.7tsi Exp $ */
 /*
  * $Workfile: nsc_gx1_video.c $
  * $Revision$
diff --git a/src/nsc_gx2_accel.c b/src/nsc_gx2_accel.c
index 2f0dbf9..a41b8b7 100644
--- a/src/nsc_gx2_accel.c
+++ b/src/nsc_gx2_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_accel.c,v 1.5 2003/11/03 05:11:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_accel.c,v 1.4tsi Exp $ */
 /*
  * $Workfile: nsc_gx2_accel.c $
  * $Revision$
diff --git a/src/nsc_gx2_cursor.c b/src/nsc_gx2_cursor.c
index ecf2704..10106a6 100644
--- a/src/nsc_gx2_cursor.c
+++ b/src/nsc_gx2_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_cursor.c,v 1.6 2003/11/03 05:11:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_cursor.c,v 1.5tsi Exp $ */
 /*
  * $Workfile: nsc_gx2_cursor.c $
  * $Revision$
diff --git a/src/nsc_gx2_dga.c b/src/nsc_gx2_dga.c
index 0287eda..99dd2a8 100644
--- a/src/nsc_gx2_dga.c
+++ b/src/nsc_gx2_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_dga.c,v 1.2 2003/01/14 09:34:32 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_dga.c,v 1.1 2002/12/10 15:12:24 alanh Exp $ */
 /*
  * $Workfile: nsc_gx2_dga.c $
  * $Revision$
diff --git a/src/nsc_gx2_driver.c b/src/nsc_gx2_driver.c
index cc937a8..37944a3 100644
--- a/src/nsc_gx2_driver.c
+++ b/src/nsc_gx2_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_driver.c,v 1.10 2003/11/03 05:11:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_driver.c,v 1.9tsi Exp $ */
 /*
  * $Workfile: nsc_gx2_driver.c $
  * $Revision$
diff --git a/src/nsc_gx2_shadow.c b/src/nsc_gx2_shadow.c
index 4ecadf1..8f37fed 100644
--- a/src/nsc_gx2_shadow.c
+++ b/src/nsc_gx2_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_shadow.c,v 1.2 2003/01/14 09:34:32 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_shadow.c,v 1.1 2002/12/10 15:12:24 alanh Exp $ */
 /*
  * $Workfile: nsc_gx2_shadow.c $
  * $Revision$
diff --git a/src/nsc_gx2_vga.c b/src/nsc_gx2_vga.c
index 2725b10..35b71b4 100644
--- a/src/nsc_gx2_vga.c
+++ b/src/nsc_gx2_vga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_vga.c,v 1.3 2003/11/03 05:11:21 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_vga.c,v 1.2tsi Exp $ */
 /*
  * $Workfile: nsc_gx2_vga.c $
  * $Revision$
diff --git a/src/nsc_gx2_video.c b/src/nsc_gx2_video.c
index d4546ef..2213f32 100644
--- a/src/nsc_gx2_video.c
+++ b/src/nsc_gx2_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c,v 1.7 2003/11/10 18:22:24 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx2_video.c,v 1.6tsi Exp $ */
 /*
  * $Workfile: nsc_gx2_video.c $
  * $Revision$
diff --git a/src/nsc_msr_asm.S b/src/nsc_msr_asm.S
index c0c4a3c..a09b730 100644
--- a/src/nsc_msr_asm.S
+++ b/src/nsc_msr_asm.S
@@ -1,5 +1,5 @@
 /*
-# $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.S,v 1.1 2002/12/12 22:13:34 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.s,v 1.1 2002/12/10 15:12:25 alanh Exp $
 ##########################################################################
 # NSC_LIC_ALTERNATIVE_PREAMBLE
 #
diff --git a/src/nsc_regacc.c b/src/nsc_regacc.c
index 45c720d..6b94d17 100644
--- a/src/nsc_regacc.c
+++ b/src/nsc_regacc.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_regacc.c,v 1.2 2003/01/14 09:34:32 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_regacc.c,v 1.1 2002/12/10 15:12:25 alanh Exp $ */
 /*
  * $Workfile: nsc_regacc.c $
  * $Revision$
diff --git a/src/panel.c b/src/panel.c
index 9f79c6c..ea2732f 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel.c,v 1.3 2003/01/14 09:34:32 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel.c,v 1.2 2002/12/11 22:51:00 dawes Exp $ */
 /*
  * $Workfile: panel.c $
  * $Revision$
diff --git a/src/panel/92xx.h b/src/panel/92xx.h
index 15420d3..427fc50 100644
--- a/src/panel/92xx.h
+++ b/src/panel/92xx.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/92xx.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: 92xx.h $
  * $Revision$
diff --git a/src/panel/cen9211.c b/src/panel/cen9211.c
index 7d3a854..b62b1fe 100644
--- a/src/panel/cen9211.c
+++ b/src/panel/cen9211.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.c,v 1.2 2003/11/03 05:11:24 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.c,v 1.1tsi Exp $ */
 /*
  * $Workfile: cen9211.c $
  *
diff --git a/src/panel/cen9211.h b/src/panel/cen9211.h
index 4ce56cb..f3836c9 100644
--- a/src/panel/cen9211.h
+++ b/src/panel/cen9211.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/cen9211.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: cen9211.h $
  * $Revision$
diff --git a/src/panel/dora9211.c b/src/panel/dora9211.c
index de30ab3..020afe8 100644
--- a/src/panel/dora9211.c
+++ b/src/panel/dora9211.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: dora9211.c $
  * $Revision$
diff --git a/src/panel/dora9211.h b/src/panel/dora9211.h
index 4413114..a215b86 100644
--- a/src/panel/dora9211.h
+++ b/src/panel/dora9211.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/dora9211.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: dora9211.h $
  * $Revision$
diff --git a/src/panel/drac9210.c b/src/panel/drac9210.c
index 8d9f477..d0e108a 100644
--- a/src/panel/drac9210.c
+++ b/src/panel/drac9210.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.c,v 1.2 2003/01/14 09:34:35 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
 /*
  * $Workfile: drac9210.c $
  * $Revision$
diff --git a/src/panel/drac9210.h b/src/panel/drac9210.h
index f71a97f..ce4fceb 100644
--- a/src/panel/drac9210.h
+++ b/src/panel/drac9210.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/drac9210.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: drac9210.h $
  * $Revision$
diff --git a/src/panel/gx2_9211.c b/src/panel/gx2_9211.c
index 71909f8..bff4458 100644
--- a/src/panel/gx2_9211.c
+++ b/src/panel/gx2_9211.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.c,v 1.3 2003/01/14 09:34:35 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.c,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
 /*
  * $Workfile: gx2_9211.c $
  *
diff --git a/src/panel/gx2_9211.h b/src/panel/gx2_9211.h
index a545cb1..9ea685b 100644
--- a/src/panel/gx2_9211.h
+++ b/src/panel/gx2_9211.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.h,v 1.3 2003/01/14 09:34:35 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/gx2_9211.h,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
 /*
  * $Workfile: gx2_9211.h $
  *
diff --git a/src/panel/panel.c b/src/panel/panel.c
index 194bbed..5880974 100644
--- a/src/panel/panel.c
+++ b/src/panel/panel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.c,v 1.3 2003/01/14 09:34:35 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.c,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
 /*
  * $Workfile: panel.c $
  * $Revision$
diff --git a/src/panel/panel.h b/src/panel/panel.h
index 79c1d21..e8d36dd 100644
--- a/src/panel/panel.h
+++ b/src/panel/panel.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.h,v 1.3 2003/01/14 09:34:36 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/panel.h,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
 /*
  * $Workfile: panel.h $
  * $Revision$
diff --git a/src/panel/platform.c b/src/panel/platform.c
index ee98b95..f8eb67f 100644
--- a/src/panel/platform.c
+++ b/src/panel/platform.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/platform.c,v 1.4 2003/11/03 05:11:24 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/platform.c,v 1.3tsi Exp $ */
 /*
  * $Workfile: platform.c $
  * $Revision$
diff --git a/src/panel/pnl_bios.c b/src/panel/pnl_bios.c
index 433f568..a7ba861 100644
--- a/src/panel/pnl_bios.c
+++ b/src/panel/pnl_bios.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_bios.c,v 1.3 2003/01/14 09:34:36 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_bios.c,v 1.2 2002/12/11 22:51:02 dawes Exp $ */
 /*
  * $Workfile: pnl_bios.c $
  * $Revision$
diff --git a/src/panel/pnl_defs.h b/src/panel/pnl_defs.h
index 37a37c7..55f40b7 100644
--- a/src/panel/pnl_defs.h
+++ b/src/panel/pnl_defs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_defs.h,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: pnl_defs.h $
  *
diff --git a/src/panel/pnl_init.c b/src/panel/pnl_init.c
index 1c5a0e0..23ee2aa 100644
--- a/src/panel/pnl_init.c
+++ b/src/panel/pnl_init.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/pnl_init.c,v 1.1 2002/12/10 15:12:28 alanh Exp $ */
+/* $XFree86$ */
 /*
  * $Workfile: pnl_init.c $
  * $Revision$
diff --git a/src/panel/readme.txt b/src/panel/readme.txt
index bfe92f3..6bcb8ec 100644
--- a/src/panel/readme.txt
+++ b/src/panel/readme.txt
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/panel/readme.txt,v 1.2 2002/12/10 15:41:27 alanh Exp $ */
+/* $XFree86$ */
 Panel Library
 Release 1.3.2
 OS - Can be used in all OS's.