diff options
author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:27 +0000 |
---|---|---|
committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:27 +0000 |
commit | 358885f2fec6365f8e061fd5b547e95229bc45f5 (patch) | |
tree | 86856115ce41bc8e2dc8a8de218e642889c13bba /src | |
parent | 23a8e1b91ca8b618f4a55d028499c7bd88c81424 (diff) |
DRI XFree86-4_3_99_12-merge importDRI-trunk-20040721DRI-trunk-20040613DRI-XFree86-4_3_99_12-merge
Diffstat (limited to 'src')
-rw-r--r-- | src/generic.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) |