From 3a82f8a35b2c6d094cf9d0d5a3ccb9dd9b85f626 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 15 Nov 2010 09:43:51 +0000 Subject: xserver git update 15/11/2010 --- xorg-server/hw/xfree86/parser/Monitor.c | 7 ------- xorg-server/hw/xfree86/parser/xf86Parser.h | 1 - xorg-server/hw/xfree86/parser/xf86tokens.h | 1 - 3 files changed, 9 deletions(-) (limited to 'xorg-server/hw/xfree86/parser') diff --git a/xorg-server/hw/xfree86/parser/Monitor.c b/xorg-server/hw/xfree86/parser/Monitor.c index 8ad7c2e79..24fe4ba0d 100644 --- a/xorg-server/hw/xfree86/parser/Monitor.c +++ b/xorg-server/hw/xfree86/parser/Monitor.c @@ -105,7 +105,6 @@ static xf86ConfigSymTabRec TimingTab[] = {TT_HSKEW, "hskew"}, {TT_BCAST, "bcast"}, {TT_VSCAN, "vscan"}, - {TT_CUSTOM, "CUSTOM"}, {-1, ""}, }; @@ -247,9 +246,6 @@ xf86parseModeLine (void) ptr->ml_vscan = val.num; ptr->ml_flags |= XF86CONF_VSCAN; break; - case TT_CUSTOM: - ptr->ml_flags |= XF86CONF_CUSTOM; - break; case EOF_TOKEN: Error (UNEXPECTED_EOF_MSG, NULL); break; @@ -370,9 +366,6 @@ xf86parseVerboseMode (void) case TT_DBLSCAN: ptr->ml_flags |= XF86CONF_DBLSCAN; break; - case TT_CUSTOM: - ptr->ml_flags |= XF86CONF_CUSTOM; - break; case EOF_TOKEN: Error (UNEXPECTED_EOF_MSG, NULL); break; diff --git a/xorg-server/hw/xfree86/parser/xf86Parser.h b/xorg-server/hw/xfree86/parser/xf86Parser.h index f8c9c3cde..bb7025dc4 100644 --- a/xorg-server/hw/xfree86/parser/xf86Parser.h +++ b/xorg-server/hw/xfree86/parser/xf86Parser.h @@ -119,7 +119,6 @@ XF86ConfModuleRec, *XF86ConfModulePtr; #define XF86CONF_NCSYNC 0x0100 #define XF86CONF_HSKEW 0x0200 /* hskew provided */ #define XF86CONF_BCAST 0x0400 -#define XF86CONF_CUSTOM 0x0800 /* timing numbers customized by editor */ #define XF86CONF_VSCAN 0x1000 typedef struct diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h index 8c7ea1b28..d91755d7e 100644 --- a/xorg-server/hw/xfree86/parser/xf86tokens.h +++ b/xorg-server/hw/xfree86/parser/xf86tokens.h @@ -165,7 +165,6 @@ typedef enum { TT_HSKEW, TT_BCAST, TT_VSCAN, - TT_CUSTOM, /* Module tokens */ LOAD, -- cgit v1.2.3