diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-26 08:58:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-26 08:58:03 +0000 |
| commit | e60ed91097aa7511581b6c53b9e4b14aaf1027b5 (patch) | |
| tree | c8ce06db36103141858e95febad857ca989e7ad0 /xorg-server/hw/xfree86/common/xf86Option.c | |
| parent | fb91c8589937f1a9aba5d5a4e0de98c381dfe9b8 (diff) | |
| parent | fade1b113f18f3fd26c3c01ca4543effa80b9b62 (diff) | |
| download | vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.tar.gz vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.tar.bz2 vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Option.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Option.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Option.c b/xorg-server/hw/xfree86/common/xf86Option.c index 9856a6352..d1dcb0f94 100644 --- a/xorg-server/hw/xfree86/common/xf86Option.c +++ b/xorg-server/hw/xfree86/common/xf86Option.c @@ -164,6 +164,10 @@ xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts, else
pInfo->options = tmp;
}
+
+ if (pInfo->conf_idev && pInfo->conf_idev->attrs) {
+ pInfo->attrs = pInfo->conf_idev->attrs;
+ }
}
/* Created for new XInput stuff -- essentially extensions to the parser */
|