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 | e1d9c9df4b1f0a2a0318e621e3838284ce49db30 (patch) | |
| tree | a22326b14852246d8b9bd7da55ccdd2a3e43baa8 | |
| parent | 5a01d1437514492397158ee26c597589e8a6935f (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
| -rw-r--r-- | src/cg6_driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cg6_driver.c b/src/cg6_driver.c index bf9a333..a9619d2 100644 --- a/src/cg6_driver.c +++ b/src/cg6_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/suncg6/cg6_driver.c,v 1.7 2002/12/06 16:44:38 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_driver.c,v 1.8 2003/10/30 17:37:12 tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -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 int CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, - int flags); +static ModeStatus CG6ValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags); void CG6Sync(ScrnInfoPtr pScrn); @@ -644,7 +644,7 @@ CG6FreeScreen(int scrnIndex, int flags) /* Checks if a mode is suitable for the selected chipset. */ /* Optional */ -static int +static ModeStatus CG6ValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) |