diff options
author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:59 +0000 |
---|---|---|
committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:59 +0000 |
commit | a302d3993349aeec3fbf3bf753e1e7d57519b300 (patch) | |
tree | 698690326bc1dc647f035ee7fa3877179efde88b /src/ffb_driver.c | |
parent | e04839d52cadd3b08c48d86d7416d28e7c89427c (diff) |
DRI XFree86-4_3_99_12-merge importDRI-XFree86-4_3_99_12-merge
Diffstat (limited to 'src/ffb_driver.c')
-rw-r--r-- | src/ffb_driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ffb_driver.c b/src/ffb_driver.c index 0c3d4ce..8921955 100644 --- a/src/ffb_driver.c +++ b/src/ffb_driver.c @@ -58,8 +58,8 @@ static void FFBAdjustFrame(int scrnIndex, int x, int y, int flags); /* Optional functions */ static void FFBFreeScreen(int scrnIndex, int flags); -static ModeStatus FFBValidMode(int scrnIndex, DisplayModePtr mode, - Bool verbose, int flags); +static int FFBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, + int flags); static void FFBDPMSMode(ScrnInfoPtr pScrn, int DPMSMode, int flags); /* ffb_dga.c */ extern void FFB_InitDGA(ScreenPtr pScreen); @@ -114,7 +114,7 @@ static XF86ModuleVersionInfo sunffbVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XORG_VERSION_CURRENT, + XF86_VERSION_CURRENT, FFB_MAJOR_VERSION, FFB_MINOR_VERSION, FFB_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, @@ -1078,7 +1078,7 @@ FFBFreeScreen(int scrnIndex, int flags) /* Checks if a mode is suitable for the selected chipset. */ /* Optional */ -static ModeStatus +static int FFBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) |