18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW

    a changed license. There was only one change which happened to be from
    me (Egbert Eich).

43 files changed, 43 insertions, 43 deletions

diff --git a/man/sunffb.man b/man/sunffb.man
index e30c73a..5f0a869 100644
--- a/man/sunffb.man
+++ b/man/sunffb.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/sunffb.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/sunffb.man,v 1.1 2001/01/24 00:06:30 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH FFB __drivermansuffix__ __vendorversion__
diff --git a/src/VISmoveImage.s b/src/VISmoveImage.s
index 43815f5..f307173 100644
--- a/src/VISmoveImage.s
+++ b/src/VISmoveImage.s
@@ -21,7 +21,7 @@
  * IN 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: xc/programs/Xserver/hw/xfree86/drivers/sunffb/VISmoveImage.s,v 1.2 2000/05/23 04:47:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/VISmoveImage.s,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
 
 
 /* NOTE NOTE NOTE: All loads in these routines _MUST_ be 64-byte block
diff --git a/src/ffb.h b/src/ffb.h
index af54db2..033ca77 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -24,7 +24,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h,v 1.8 2002/12/06 02:44:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb.h,v 1.7tsi Exp $ */
 
 #ifndef FFB_H
 #define FFB_H
diff --git a/src/ffb_accel.c b/src/ffb_accel.c
index 9aeb71d..f101739 100644
--- a/src/ffb_accel.c
+++ b/src/ffb_accel.c
@@ -24,7 +24,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.7 2003/11/10 18:22:31 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c,v 1.6tsi Exp $ */
 
 #include	"scrnintstr.h"
 #include	"pixmapstr.h"
diff --git a/src/ffb_asm.s b/src/ffb_asm.s
index 37ca92e..dfc59be 100644
--- a/src/ffb_asm.s
+++ b/src/ffb_asm.s
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_asm.s,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
+/* $XFree86$ */
 
 /* Hardware register offsets */
 #define FFB_BY		0x0060
diff --git a/src/ffb_attr.c b/src/ffb_attr.c
index c3baf31..bd40e7d 100644
--- a/src/ffb_attr.c
+++ b/src/ffb_attr.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_attr.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_attr.c,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_fifo.h"
diff --git a/src/ffb_bcopy.c b/src/ffb_bcopy.c
index 6de0eac..195eac3 100644
--- a/src/ffb_bcopy.c
+++ b/src/ffb_bcopy.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_bcopy.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_bcopy.c,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_checks.c b/src/ffb_checks.c
index d809aa6..2517f04 100644
--- a/src/ffb_checks.c
+++ b/src/ffb_checks.c
@@ -23,7 +23,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_checks.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_checks.c,v 1.1 2000/05/18 23:21:35 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_circle.c b/src/ffb_circle.c
index 5c46b01..bd8ea0d 100644
--- a/src/ffb_circle.c
+++ b/src/ffb_circle.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_circle.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_circle.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_clip.c b/src/ffb_clip.c
index 2369381..ae24b79 100644
--- a/src/ffb_clip.c
+++ b/src/ffb_clip.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
+/* $XFree86$ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_clip.h b/src/ffb_clip.h
index b90655b..85cd4d9 100644
--- a/src/ffb_clip.h
+++ b/src/ffb_clip.h
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_clip.h,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef FFBCLIP_H
 #define FFBCLIP_H
diff --git a/src/ffb_cplane.c b/src/ffb_cplane.c
index 6a75d34..5f5a2e0 100644
--- a/src/ffb_cplane.c
+++ b/src/ffb_cplane.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c,v 1.3 2003/07/19 13:22:29 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cplane.c,v 1.2tsi Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_cursor.c b/src/ffb_cursor.c
index 3fc2292..f3a9517 100644
--- a/src/ffb_cursor.c
+++ b/src/ffb_cursor.c
@@ -23,7 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cursor.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_cursor.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
 
 #include "ffb.h"
 
diff --git a/src/ffb_dac.c b/src/ffb_dac.c
index 01b746e..d1e841b 100644
--- a/src/ffb_dac.c
+++ b/src/ffb_dac.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.c,v 1.4 2002/12/06 02:44:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.c,v 1.3tsi Exp $ */
 
 #include "ffb.h"
 #include "ffb_rcache.h"
diff --git a/src/ffb_dac.h b/src/ffb_dac.h
index b6c4f5d..3f799b5 100644
--- a/src/ffb_dac.h
+++ b/src/ffb_dac.h
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.h,v 1.2 2001/04/05 17:42:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dac.h,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
 
 #ifndef _FFB_DAC_H
 #define _FFB_DAC_H
diff --git a/src/ffb_dbe.c b/src/ffb_dbe.c
index 09395f7..52b6943 100644
--- a/src/ffb_dbe.c
+++ b/src/ffb_dbe.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c,v 1.2 2003/02/11 03:19:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
 
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/src/ffb_ddc.c b/src/ffb_ddc.c
index 6d1a312..6185739 100644
--- a/src/ffb_ddc.c
+++ b/src/ffb_ddc.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_ddc.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86$ */
 
 #include "ffb.h"
 
diff --git a/src/ffb_dga.c b/src/ffb_dga.c
index 3ba43df..0e6c726 100644
--- a/src/ffb_dga.c
+++ b/src/ffb_dga.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c,v 1.2 2000/10/17 16:53:17 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/ffb_dri.c b/src/ffb_dri.c
index 334bdfd..c5e624f 100644
--- a/src/ffb_dri.c
+++ b/src/ffb_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v 1.9 2001/05/02 15:06:10 dawes Exp $
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c,v 1.8 2001/04/18 14:52:42 dawes Exp $
  * Acceleration for the Creator and Creator3D framebuffer - DRI/DRM support.
  *
  * Copyright (C) 2000 David S. Miller (davem@redhat.com)
diff --git a/src/ffb_drishare.h b/src/ffb_drishare.h
index 501dd5b..4cb8588 100644
--- a/src/ffb_drishare.h
+++ b/src/ffb_drishare.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_drishare.h,v 1.2 2000/06/21 00:47:37 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef _FFB_DRISHARE_H
 #define _FFB_DRISHARE_H
diff --git a/src/ffb_driver.c b/src/ffb_driver.c
index 2178cc8..e699eef 100644
--- a/src/ffb_driver.c
+++ b/src/ffb_driver.c
@@ -20,7 +20,7 @@
  * IN 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: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c,v 1.12 2003/10/30 17:37:12 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c,v 1.11 2002/12/06 02:44:04 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/ffb_fifo.h b/src/ffb_fifo.h
index 0957e84..2a156c7 100644
--- a/src/ffb_fifo.h
+++ b/src/ffb_fifo.h
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fifo.h,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fifo.h,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
 
 #ifndef FFBFIFO_H
 #define FFBFIFO_H
diff --git a/src/ffb_frect.c b/src/ffb_frect.c
index 340efef..eb1a70d 100644
--- a/src/ffb_frect.c
+++ b/src/ffb_frect.c
@@ -24,7 +24,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_frect.c,v 1.3 2001/04/05 17:42:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_frect.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_fspans.c b/src/ffb_fspans.c
index 4599015..88b5c82 100644
--- a/src/ffb_fspans.c
+++ b/src/ffb_fspans.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_fspans.c,v 1.1 2000/05/18 23:21:36 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_gc.c b/src/ffb_gc.c
index 59cde91..59c876c 100644
--- a/src/ffb_gc.c
+++ b/src/ffb_gc.c
@@ -24,7 +24,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.4 2003/06/23 17:35:48 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.c,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_gc.h b/src/ffb_gc.h
index 3e62269..7fd45a2 100644
--- a/src/ffb_gc.h
+++ b/src/ffb_gc.h
@@ -24,7 +24,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.h,v 1.2 2000/05/23 04:47:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gc.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #ifndef FFBGC_H
 #define FFBGC_H
diff --git a/src/ffb_glyph.c b/src/ffb_glyph.c
index 76668e3..eae88a4 100644
--- a/src/ffb_glyph.c
+++ b/src/ffb_glyph.c
@@ -24,7 +24,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_glyph.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_gspans.c b/src/ffb_gspans.c
index 5c00cb7..99f1042 100644
--- a/src/ffb_gspans.c
+++ b/src/ffb_gspans.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gspans.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_gspans.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_line.c b/src/ffb_line.c
index e94fd03..a98b1c1 100644
--- a/src/ffb_line.c
+++ b/src/ffb_line.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_line.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_line.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_loops.h b/src/ffb_loops.h
index efb14c3..c61e1dd 100644
--- a/src/ffb_loops.h
+++ b/src/ffb_loops.h
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_loops.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef FFBLOOPS_H
 #define FFBLOOPS_H
diff --git a/src/ffb_plygon.c b/src/ffb_plygon.c
index 933b15f..c51e71a 100644
--- a/src/ffb_plygon.c
+++ b/src/ffb_plygon.c
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_plygon.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_plygon.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_point.c b/src/ffb_point.c
index 407f22c..9a9bc0e 100644
--- a/src/ffb_point.c
+++ b/src/ffb_point.c
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_point.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_point.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_rcache.h b/src/ffb_rcache.h
index 5beb23e..09e0f3f 100644
--- a/src/ffb_rcache.h
+++ b/src/ffb_rcache.h
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rcache.h,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rcache.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #ifndef FFBRCACHE_H
 #define FFBRCACHE_H
diff --git a/src/ffb_rect.c b/src/ffb_rect.c
index 30ef015..bde38be 100644
--- a/src/ffb_rect.c
+++ b/src/ffb_rect.c
@@ -21,7 +21,7 @@
  * IN 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: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rect.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_rect.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #define PSZ 32
 
diff --git a/src/ffb_regs.h b/src/ffb_regs.h
index 7f383d3..27e2092 100644
--- a/src/ffb_regs.h
+++ b/src/ffb_regs.h
@@ -24,7 +24,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_regs.h,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef FFBREGS_H
 #define FFBREGS_H
diff --git a/src/ffb_seg.c b/src/ffb_seg.c
index 930632f..a5fe99f 100644
--- a/src/ffb_seg.c
+++ b/src/ffb_seg.c
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_seg.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_seg.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_sspans.c b/src/ffb_sspans.c
index 3d4b2ae..721e6fb 100644
--- a/src/ffb_sspans.c
+++ b/src/ffb_sspans.c
@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_sspans.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_sspans.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_stip.c b/src/ffb_stip.c
index d79b232..7744f15 100644
--- a/src/ffb_stip.c
+++ b/src/ffb_stip.c
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.c,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_stip.h b/src/ffb_stip.h
index 3d490d0..ef8935a 100644
--- a/src/ffb_stip.h
+++ b/src/ffb_stip.h
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stip.h,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
+/* $XFree86$ */
 
 #ifndef FFBSTIP_H
 #define FFBSTIP_H
diff --git a/src/ffb_stubs.c b/src/ffb_stubs.c
index aa01018..e5c3a78 100644
--- a/src/ffb_stubs.c
+++ b/src/ffb_stubs.c
@@ -22,7 +22,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stubs.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_stubs.c,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"
diff --git a/src/ffb_wid.c b/src/ffb_wid.c
index f84c0bc..b2a1391 100644
--- a/src/ffb_wid.c
+++ b/src/ffb_wid.c
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wid.c,v 1.3 2000/12/01 00:24:34 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wid.c,v 1.2 2000/06/20 05:08:48 dawes Exp $ */
 
 #include "ffb.h"
 
diff --git a/src/ffb_wline.c b/src/ffb_wline.c
index feb8034..c24b640 100644
--- a/src/ffb_wline.c
+++ b/src/ffb_wline.c
@@ -23,7 +23,7 @@
  * IN THE SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wline.c,v 1.3 2001/03/03 22:41:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_wline.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
 
 #define PSZ 32
 
diff --git a/src/ffb_zeroarc.c b/src/ffb_zeroarc.c
index 86b5876..7147989 100644
--- a/src/ffb_zeroarc.c
+++ b/src/ffb_zeroarc.c
@@ -24,7 +24,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_zeroarc.c,v 1.2 2000/05/23 04:47:45 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_zeroarc.c,v 1.1 2000/05/18 23:21:38 dawes Exp $ */
 
 #include "ffb.h"
 #include "ffb_regs.h"