Current order causes the user-configured option list to be overwritten with the default list supplied by the driver. Swap around so we overwrite the driver's default values instead.
This only affected options supplied by the driver such as XkbLayout in the case of evdev. Reported-by: Sebastian Glita <[email protected]> Reported-by: Simon Thum <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> --- hw/xfree86/common/xf86Option.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index d49aa31..16c27e5 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -130,7 +130,7 @@ xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts) if (defaultOpts) { XF86OptionPtr tmp =xf86optionListCreate(defaultOpts, -1, 0); if (pInfo->options) - pInfo->options = xf86optionListMerge(pInfo->options, tmp); + pInfo->options = xf86optionListMerge(tmp, pInfo->options); else pInfo->options = tmp; } -- 1.7.3.3 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
