From 358885f2fec6365f8e061fd5b547e95229bc45f5 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Wed, 16 Jun 2004 09:23:27 +0000
Subject: DRI XFree86-4_3_99_12-merge import

---
 man/vga.man   | 8 ++++----
 src/generic.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/man/vga.man b/man/vga.man
index 9eccf9e..5781c1b 100644
--- a/man/vga.man
+++ b/man/vga.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.3 2001/12/17 20:52:34 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH VGA __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ vga \- Generic VGA video driver
 .fi
 .SH DESCRIPTION
 .B vga 
-is an __xservername__ driver for generic VGA video cards.  It can drive most
+is an XFree86 driver for generic VGA video cards.  It can drive most
 VGA-compatible video cards, but only makes use of the basic standard
 VGA core that is common to these cards.  The driver supports depths 1, 4
 and 8.  All relevant visual types are supported at each depth.
@@ -28,7 +28,7 @@ The
 driver supports most VGA-compatible video cards.  There are some known
 exceptions, and those should be listed here.
 .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.
 .PP
@@ -60,6 +60,6 @@ This option is recommended for performance reasons when running at depths
 when using those depths in a multi-head configuration where one or more
 of the other screens is operating at a different depth.
 .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: Marc La France, David Dawes, and Dirk Hohndel.
diff --git a/src/generic.c b/src/generic.c
index 7ae477e..ae7920f 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -87,7 +87,7 @@ static int                  VGAFindIsaDevice(GDevPtr dev);
 static Bool                 GenericMapMem(ScrnInfoPtr scrp);
 #endif
 
-static ModeStatus GenericValidMode(int, DisplayModePtr, Bool, int);
+static int GenericValidMode(int, DisplayModePtr, Bool, int);
 
 /* The root of all evil... */
 DriverRec VGA =
@@ -178,7 +178,7 @@ static XF86ModuleVersionInfo GenericVersionRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
+    XF86_VERSION_CURRENT,
     VGA_VERSION_MAJOR, VGA_VERSION_MINOR, VGA_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,
@@ -1564,7 +1564,7 @@ GenericFreeScreen(int scrnIndex, int flags)
 }
 
 
-static ModeStatus
+static int
 GenericValidMode(int scrnIndex, DisplayModePtr pMode, Bool Verbose, int flags)
 {
     if (pMode->Flags & V_INTERLACE)
-- 
cgit v1.2.3