diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-26 07:52:44 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-26 07:52:44 +0000 |
| commit | d2ae79d77679ccfc02ef5b8e42c16d398d874464 (patch) | |
| tree | 1d566cb7bc73279e52671d2529bff1905148a32b /xorg-server/hw/xfree86/common/xf86Option.c | |
| parent | 74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58 (diff) | |
| download | vcxsrv-d2ae79d77679ccfc02ef5b8e42c16d398d874464.tar.gz vcxsrv-d2ae79d77679ccfc02ef5b8e42c16d398d874464.tar.bz2 vcxsrv-d2ae79d77679ccfc02ef5b8e42c16d398d874464.zip | |
xserver git update 26/5/2010
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 */
|