summaryrefslogtreecommitdiff
path: root/hw/xfree86/xf4bpp
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/xf4bpp')
-rw-r--r--hw/xfree86/xf4bpp/Makefile.am4
-rw-r--r--hw/xfree86/xf4bpp/OScompiler.h1
-rw-r--r--hw/xfree86/xf4bpp/emulOpStip.c1
-rw-r--r--hw/xfree86/xf4bpp/emulRepAre.c1
-rw-r--r--hw/xfree86/xf4bpp/emulTile.c1
-rw-r--r--hw/xfree86/xf4bpp/ibmTrace.h1
-rw-r--r--hw/xfree86/xf4bpp/mfbbres.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbbresd.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbfillarc.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbhrzvert.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbimggblt.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbline.c1
-rw-r--r--hw/xfree86/xf4bpp/mfbzerarc.c1
-rw-r--r--hw/xfree86/xf4bpp/offscreen.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcArea.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcBStore.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcCReduce.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcClip.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcCpArea.c8
-rw-r--r--hw/xfree86/xf4bpp/ppcDepth.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcFillRct.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcGC.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcGCstr.h1
-rw-r--r--hw/xfree86/xf4bpp/ppcGetSp.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcIO.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcImg.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcPixFS.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcPixmap.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcPntWin.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcPolyPnt.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcPolyRec.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcQuery.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcRslvC.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcSetSp.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcSpMcro.h1
-rw-r--r--hw/xfree86/xf4bpp/ppcWinFS.c1
-rw-r--r--hw/xfree86/xf4bpp/ppcWindow.c1
-rw-r--r--hw/xfree86/xf4bpp/vgaBitBlt.c1
-rw-r--r--hw/xfree86/xf4bpp/vgaGC.c1
-rw-r--r--hw/xfree86/xf4bpp/vgaImages.c1
-rw-r--r--hw/xfree86/xf4bpp/vgaReg.h1
-rw-r--r--hw/xfree86/xf4bpp/vgaSolid.c1
-rw-r--r--hw/xfree86/xf4bpp/vgaStipple.c1
-rw-r--r--hw/xfree86/xf4bpp/vgaVideo.h1
-rw-r--r--hw/xfree86/xf4bpp/wm3.c1
-rw-r--r--hw/xfree86/xf4bpp/wm3.h1
-rw-r--r--hw/xfree86/xf4bpp/xf4bpp.h1
47 files changed, 5 insertions, 52 deletions
diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am
index 56b690f4b..7cb4ac235 100644
--- a/hw/xfree86/xf4bpp/Makefile.am
+++ b/hw/xfree86/xf4bpp/Makefile.am
@@ -57,6 +57,6 @@ mfbseg.c:
echo "#define POLYSEGMENT" > $@
echo "#include \"$(srcdir)/mfbline.c\"" >> $@
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb
-AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
+AM_CFLAGS = $(XORG_CFLAGS)
diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h
index cc4266c3a..65f002000 100644
--- a/hw/xfree86/xf4bpp/OScompiler.h
+++ b/hw/xfree86/xf4bpp/OScompiler.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.3 1999/01/31 12:22:15 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c
index 2f63b1435..22ba90c2b 100644
--- a/hw/xfree86/xf4bpp/emulOpStip.c
+++ b/hw/xfree86/xf4bpp/emulOpStip.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c
index 9ae62149f..235bf9bd0 100644
--- a/hw/xfree86/xf4bpp/emulRepAre.c
+++ b/hw/xfree86/xf4bpp/emulRepAre.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c
index c4f15cad6..ddce1dab0 100644
--- a/hw/xfree86/xf4bpp/emulTile.c
+++ b/hw/xfree86/xf4bpp/emulTile.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.3tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h
index 15231a653..1bed6759f 100644
--- a/hw/xfree86/xf4bpp/ibmTrace.h
+++ b/hw/xfree86/xf4bpp/ibmTrace.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.1.2.1 1998/06/27 14:48:30 dawes Exp $ */
diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c
index b54e23965..f0c3f7e7b 100644
--- a/hw/xfree86/xf4bpp/mfbbres.c
+++ b/hw/xfree86/xf4bpp/mfbbres.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.2 1998/07/25 16:59:28 dawes Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c
index d28a6c2a3..ef800871e 100644
--- a/hw/xfree86/xf4bpp/mfbbresd.c
+++ b/hw/xfree86/xf4bpp/mfbbresd.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c
index e2cab12f5..88d4f72d9 100644
--- a/hw/xfree86/xf4bpp/mfbfillarc.c
+++ b/hw/xfree86/xf4bpp/mfbfillarc.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.5tsi Exp $ */
/************************************************************
Copyright (c) 1989 X Consortium
diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c
index eb510c0fb..82a205e1b 100644
--- a/hw/xfree86/xf4bpp/mfbhrzvert.c
+++ b/hw/xfree86/xf4bpp/mfbhrzvert.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.2 1998/07/25 16:59:29 dawes Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c
index 03107bbf3..b1f0b9f72 100644
--- a/hw/xfree86/xf4bpp/mfbimggblt.c
+++ b/hw/xfree86/xf4bpp/mfbimggblt.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.8 2003/11/03 05:11:56 tsi Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c
index 5df58a7e4..82d8bd1c5 100644
--- a/hw/xfree86/xf4bpp/mfbline.c
+++ b/hw/xfree86/xf4bpp/mfbline.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.5 2003/11/03 05:11:56 tsi Exp $ */
/***********************************************************
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c
index 54aa3b0c9..921993196 100644
--- a/hw/xfree86/xf4bpp/mfbzerarc.c
+++ b/hw/xfree86/xf4bpp/mfbzerarc.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.4tsi Exp $ */
/************************************************************
diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c
index 1bf634c80..f35bde7dd 100644
--- a/hw/xfree86/xf4bpp/offscreen.c
+++ b/hw/xfree86/xf4bpp/offscreen.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.4 1999/10/13 20:04:26 alanh Exp $ */
/*
* Copyright 1993 Gerrit Jan Akkerman
*
diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c
index 56cab0d64..9c693e836 100644
--- a/hw/xfree86/xf4bpp/ppcArea.c
+++ b/hw/xfree86/xf4bpp/ppcArea.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.3tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c
index 7686b6f9b..947602ef3 100644
--- a/hw/xfree86/xf4bpp/ppcBStore.c
+++ b/hw/xfree86/xf4bpp/ppcBStore.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c
index f937aac34..ab46f85ab 100644
--- a/hw/xfree86/xf4bpp/ppcCReduce.c
+++ b/hw/xfree86/xf4bpp/ppcCReduce.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c
index 9166bf256..acfd5bd00 100644
--- a/hw/xfree86/xf4bpp/ppcClip.c
+++ b/hw/xfree86/xf4bpp/ppcClip.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.4 1999/06/06 08:48:58 dawes Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c
index e33795c77..2242074c1 100644
--- a/hw/xfree86/xf4bpp/ppcCpArea.c
+++ b/hw/xfree86/xf4bpp/ppcCpArea.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.6tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
@@ -56,8 +55,7 @@ SOFTWARE.
#include "xf4bpp.h"
#include "mfbmap.h"
#define PSZ 8
-#include "cfb.h"
-#include "cfbmskbits.h"
+#include "mfb.h"
#include "mergerop.h"
#include "mi.h"
#include "pixmapstr.h"
@@ -88,8 +86,8 @@ vga16DoBitblt
int w, h;
int careful;
- widthSrc = cfbGetLongWidth(pSrc);
- widthDst = cfbGetLongWidth(pDst);
+ widthSrc = mfbGetPixelWidth(pSrc);
+ widthDst = mfbGetPixelWidth(pDst);
/* XXX we have to err on the side of safety when both are windows,
* because we don't know if IncludeInferiors is being used.
diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c
index 8a67cdd30..26a53de86 100644
--- a/hw/xfree86/xf4bpp/ppcDepth.c
+++ b/hw/xfree86/xf4bpp/ppcDepth.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.2 1998/07/25 16:59:33 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c
index 28c7acb6c..e501f65fb 100644
--- a/hw/xfree86/xf4bpp/ppcFillRct.c
+++ b/hw/xfree86/xf4bpp/ppcFillRct.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.5tsi Exp $ */
/* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */
/***********************************************************
diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c
index 4aafb706b..8153051f0 100644
--- a/hw/xfree86/xf4bpp/ppcGC.c
+++ b/hw/xfree86/xf4bpp/ppcGC.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.7tsi Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h
index 12a573c9d..fd064d1c1 100644
--- a/hw/xfree86/xf4bpp/ppcGCstr.h
+++ b/hw/xfree86/xf4bpp/ppcGCstr.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.3 2003/02/18 21:29:59 tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c
index 0c48de4c8..dc31741f3 100644
--- a/hw/xfree86/xf4bpp/ppcGetSp.c
+++ b/hw/xfree86/xf4bpp/ppcGetSp.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.2 1998/07/25 16:59:34 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c
index 20b08ce9a..0d5afafa5 100644
--- a/hw/xfree86/xf4bpp/ppcIO.c
+++ b/hw/xfree86/xf4bpp/ppcIO.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.5tsi Exp $ */
/*
Copyright (c) 1990 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c
index ab8774216..6ff7e8fef 100644
--- a/hw/xfree86/xf4bpp/ppcImg.c
+++ b/hw/xfree86/xf4bpp/ppcImg.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.4tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c
index c8801fd32..08b09e9c7 100644
--- a/hw/xfree86/xf4bpp/ppcPixFS.c
+++ b/hw/xfree86/xf4bpp/ppcPixFS.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.4tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c
index 0ccefcbd6..9f4cdc99a 100644
--- a/hw/xfree86/xf4bpp/ppcPixmap.c
+++ b/hw/xfree86/xf4bpp/ppcPixmap.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.3 1999/01/14 13:05:34 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c
index 11195e033..85ac22e6c 100644
--- a/hw/xfree86/xf4bpp/ppcPntWin.c
+++ b/hw/xfree86/xf4bpp/ppcPntWin.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c
index c78622482..399ba3bda 100644
--- a/hw/xfree86/xf4bpp/ppcPolyPnt.c
+++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c
index 085cb4b25..d7f866232 100644
--- a/hw/xfree86/xf4bpp/ppcPolyRec.c
+++ b/hw/xfree86/xf4bpp/ppcPolyRec.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.2 1998/07/25 16:59:36 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c
index 95914846d..810b81f24 100644
--- a/hw/xfree86/xf4bpp/ppcQuery.c
+++ b/hw/xfree86/xf4bpp/ppcQuery.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.2 1998/07/25 16:59:37 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c
index ce00a8799..e4601e2af 100644
--- a/hw/xfree86/xf4bpp/ppcRslvC.c
+++ b/hw/xfree86/xf4bpp/ppcRslvC.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.4 1999/06/06 08:49:01 dawes Exp $ */
/************************************************************
Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA.
diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c
index ffdc5d970..350cb9b14 100644
--- a/hw/xfree86/xf4bpp/ppcSetSp.c
+++ b/hw/xfree86/xf4bpp/ppcSetSp.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.2 1998/07/25 16:59:41 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h
index bc56ca1fc..41245ceb3 100644
--- a/hw/xfree86/xf4bpp/ppcSpMcro.h
+++ b/hw/xfree86/xf4bpp/ppcSpMcro.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.1.2.1 1998/06/27 14:48:49 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c
index 820b80e53..bd9b1289f 100644
--- a/hw/xfree86/xf4bpp/ppcWinFS.c
+++ b/hw/xfree86/xf4bpp/ppcWinFS.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.3tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c
index a2e910b1c..11c5e343e 100644
--- a/hw/xfree86/xf4bpp/ppcWindow.c
+++ b/hw/xfree86/xf4bpp/ppcWindow.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.3 1999/06/06 08:49:06 dawes Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c
index e13312233..e51e0dc1a 100644
--- a/hw/xfree86/xf4bpp/vgaBitBlt.c
+++ b/hw/xfree86/xf4bpp/vgaBitBlt.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */
/* GJA -- span move routines */
diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c
index 64b4dae48..fd33727b9 100644
--- a/hw/xfree86/xf4bpp/vgaGC.c
+++ b/hw/xfree86/xf4bpp/vgaGC.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.3tsi Exp $ */
/*
Copyright (c) 1987 X Consortium
diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c
index 4806b9461..22f8d8f8e 100644
--- a/hw/xfree86/xf4bpp/vgaImages.c
+++ b/hw/xfree86/xf4bpp/vgaImages.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.4tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h
index 552f07140..c5165256c 100644
--- a/hw/xfree86/xf4bpp/vgaReg.h
+++ b/hw/xfree86/xf4bpp/vgaReg.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.3 1999/06/06 08:49:07 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c
index 5cb47173c..562b1ebc4 100644
--- a/hw/xfree86/xf4bpp/vgaSolid.c
+++ b/hw/xfree86/xf4bpp/vgaSolid.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.5tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c
index a7bfa13d2..b81305bd4 100644
--- a/hw/xfree86/xf4bpp/vgaStipple.c
+++ b/hw/xfree86/xf4bpp/vgaStipple.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.5tsi Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h
index ba0aae662..14e85ef79 100644
--- a/hw/xfree86/xf4bpp/vgaVideo.h
+++ b/hw/xfree86/xf4bpp/vgaVideo.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.1.2.1 1998/06/27 14:48:54 dawes Exp $ */
/*
* Copyright IBM Corporation 1987,1988,1989
*
diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c
index 6b501b570..24ecf3dd2 100644
--- a/hw/xfree86/xf4bpp/wm3.c
+++ b/hw/xfree86/xf4bpp/wm3.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.3 1999/06/06 08:49:08 dawes Exp $ */
diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h
index 1def6f607..2d66557fc 100644
--- a/hw/xfree86/xf4bpp/wm3.h
+++ b/hw/xfree86/xf4bpp/wm3.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.2 1998/07/25 16:59:46 dawes Exp $ */
diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h
index 1f465374e..8d2da35a5 100644
--- a/hw/xfree86/xf4bpp/xf4bpp.h
+++ b/hw/xfree86/xf4bpp/xf4bpp.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.9 2003/11/03 05:11:57 tsi Exp $ */
#ifndef __XF4BPP_H__
#define __XF4BPP_H__