DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge

5 files changed, 11 insertions, 11 deletions

diff --git a/man/suncg6.man b/man/suncg6.man
index 36b7ddb..b0dc5e8 100644
--- a/man/suncg6.man
+++ b/man/suncg6.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.1 2001/01/24 00:06:29 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.man,v 1.2 2001/01/27 18:20:54 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH SUNCG6 __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ suncg6 \- GX/Turbo GX video driver
 .fi
 .SH DESCRIPTION
 .B suncg6
-is an __xservername__ driver for Sun GX and Turbo GX (also known as cgsix) video cards.
+is an XFree86 driver for Sun GX and Turbo GX (also known as cgsix) video cards.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B suncg6
 driver supports...
 .SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Jakub Jelinek <jakub@redhat.com>
diff --git a/src/cg6.h b/src/cg6.h
index 17e4673..00ed5b7 100644
--- a/src/cg6.h
+++ b/src/cg6.h
@@ -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/suncg6/cg6.h,v 1.2 2000/06/30 17:15:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6.h,v 1.3 2001/05/04 19:05:45 dawes Exp $ */
 
 #ifndef CG6_H
 #define CG6_H
diff --git a/src/cg6_cursor.c b/src/cg6_cursor.c
index 31266e5..72a396f 100644
--- a/src/cg6_cursor.c
+++ b/src/cg6_cursor.c
@@ -23,7 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
  * SOFTWARE.
  */
-/* $XFree86:$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_cursor.c,v 1.1 2000/06/30 19:30:46 dawes Exp $ */
 
 #include "cg6.h"
 
diff --git a/src/cg6_driver.c b/src/cg6_driver.c
index 6099c99..bf9a333 100644
--- a/src/cg6_driver.c
+++ b/src/cg6_driver.c
@@ -52,8 +52,8 @@ static void	CG6AdjustFrame(int scrnIndex, int x, int y, int flags);
 
 /* Optional functions */
 static void	CG6FreeScreen(int scrnIndex, int flags);
-static ModeStatus CG6ValidMode(int scrnIndex, DisplayModePtr mode,
-			       Bool verbose, int flags);
+static int	CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+			     int flags);
 
 void CG6Sync(ScrnInfoPtr pScrn);
 
@@ -105,7 +105,7 @@ static XF86ModuleVersionInfo suncg6VersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XORG_VERSION_CURRENT,
+	XF86_VERSION_CURRENT,
 	CG6_MAJOR_VERSION, CG6_MINOR_VERSION, CG6_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
@@ -644,7 +644,7 @@ CG6FreeScreen(int scrnIndex, int flags)
 /* Checks if a mode is suitable for the selected chipset. */
 
 /* Optional */
-static ModeStatus
+static int
 CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
 {
     if (mode->Flags & V_INTERLACE)
diff --git a/src/cg6_regs.h b/src/cg6_regs.h
index 28178f7..f6f3f05 100644
--- a/src/cg6_regs.h
+++ b/src/cg6_regs.h
@@ -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$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_regs.h,v 1.1 2000/05/23 04:47:43 dawes Exp $ */
 
 #ifndef CG6_REGS_H
 #define CG6_REGS_H