diff options
| author | Keith Packard <keithp@keithp.com> | 2011-10-24 22:09:00 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-24 22:09:00 -0700 |
| commit | 5701ab4a441eb113abd0851b0d71b82d12112854 (patch) | |
| tree | 33bb486d975fe46781283c9f8495b21d25d422e2 /hw/xfree86/common/xf86Option.c | |
| parent | 7d50211ab57a35910d79fc3f67ae89aff91fa995 (diff) | |
| parent | a41214bc9a0f326c6dc129e4a6382efb8b826862 (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'hw/xfree86/common/xf86Option.c')
| -rw-r--r-- | hw/xfree86/common/xf86Option.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index 73b6573f1..9c528782f 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -44,6 +44,7 @@ #include "xf86Xinput.h" #include "xf86Optrec.h" #include "xf86Parser.h" +#include "optionstr.h" static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options, OptionInfoPtr p, Bool markUsed); @@ -298,7 +299,7 @@ xf86CheckPercentOption(XF86OptionPtr optlist, const char *name, double deflt) return LookupPercentOption(optlist, name, deflt, FALSE); } /* - * addNewOption() has the required property of replacing the option value + * xf86AddNewOption() has the required property of replacing the option value * if the option is already present. */ XF86OptionPtr |