diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:00 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:00 +0000 |
| commit | a2500e2fc16728938d0904669af56528e4e895f5 (patch) | |
| tree | e5d5ee208be57ad553eb789818e33cb7f0bb71b1 | |
| parent | 7dd13bc4bb1ea8aded61721c06ea852159751ed1 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
| -rw-r--r-- | src/cg14_driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cg14_driver.c b/src/cg14_driver.c index 18e7304..5f95013 100644 --- a/src/cg14_driver.c +++ b/src/cg14_driver.c @@ -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/suncg14/cg14_driver.c,v 1.6 2001/10/01 13:44:10 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg14/cg14_driver.c,v 1.7 2003/10/30 17:37:12 tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -54,8 +54,8 @@ static void CG14AdjustFrame(int scrnIndex, int x, int y, int flags); /* Optional functions */ static void CG14FreeScreen(int scrnIndex, int flags); -static int CG14ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, - int flags); +static ModeStatus CG14ValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags); void CG14Sync(ScrnInfoPtr pScrn); @@ -618,7 +618,7 @@ CG14FreeScreen(int scrnIndex, int flags) /* Checks if a mode is suitable for the selected chipset. */ /* Optional */ -static int +static ModeStatus CG14ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) |