diff options
author | Keith Packard <keithp@keithp.com> | 2010-11-15 08:51:27 +0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-11-15 08:51:27 +0800 |
commit | ed547a9fc8a4f5cd95ef882b656a376c163eda6d (patch) | |
tree | ed0e34fed51f9e3d751022bcafe997996febe00f /hw | |
parent | 78f94f19aab66a1e5331df0ce29f36e310b4195d (diff) | |
parent | 84e8de1271bb11b5b4b9747ae4647f47333a8ab7 (diff) |
Merge remote branch 'adkins/master'
Diffstat (limited to 'hw')
-rw-r--r-- | hw/xfree86/parser/Monitor.c | 7 | ||||
-rw-r--r-- | hw/xfree86/parser/xf86Parser.h | 1 | ||||
-rw-r--r-- | hw/xfree86/parser/xf86tokens.h | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index 76c35ae74..970406d4d 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/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/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index 9f0a602ed..4f279f18d 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/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/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h index ec04e4c7d..468a2ffa2 100644 --- a/hw/xfree86/parser/xf86tokens.h +++ b/hw/xfree86/parser/xf86tokens.h @@ -165,7 +165,6 @@ typedef enum { TT_HSKEW, TT_BCAST, TT_VSCAN, - TT_CUSTOM, /* Module tokens */ LOAD, |