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 | 2525fbd9270fbc1f73b4baf9a8279f34455c3a79 (patch) | |
| tree | 5e34a32b57075450a8e6765a35e9f3ea2b834a9c | |
| parent | eb2028ee2e1734694c5c13d32bf60ab30a435d11 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
| -rw-r--r-- | src/tcx_driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tcx_driver.c b/src/tcx_driver.c index 83a1947..bca4a7a 100644 --- a/src/tcx_driver.c +++ b/src/tcx_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/suntcx/tcx_driver.c,v 1.6 2001/08/07 07:04:51 keithp Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/suntcx/tcx_driver.c,v 1.7 2003/10/30 17:37:12 tsi Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -53,8 +53,8 @@ static void TCXAdjustFrame(int scrnIndex, int x, int y, int flags); /* Optional functions */ static void TCXFreeScreen(int scrnIndex, int flags); -static int TCXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, - int flags); +static ModeStatus TCXValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags); void TCXSync(ScrnInfoPtr pScrn); @@ -720,7 +720,7 @@ TCXFreeScreen(int scrnIndex, int flags) /* Checks if a mode is suitable for the selected chipset. */ /* Optional */ -static int +static ModeStatus TCXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) |