Commit e1d9c9df authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley
Browse files

merge latest (4.3.99.16) from XFree86 (vendor) branch

parent 5a01d143
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment