summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:41 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:41 +0000
commitc3fd278071180256625e66239ee89b0f00f38fdb (patch)
treee5d5ee208be57ad553eb789818e33cb7f0bb71b1
parentd4b8203661db5f7139152c3a03734939f50d35a7 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
-rw-r--r--src/cg14_driver.c8
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)