diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-02 13:46:21 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-02 13:46:21 +0000 |
| commit | 0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b (patch) | |
| tree | 7f9e41630a661eaab39bef9023c2661a7281af96 /xorg-server/hw/xfree86/common/xf86Xinput.c | |
| parent | 8def4a30414ae76e228f285ccab8bba6de083d08 (diff) | |
| download | vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.gz vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.bz2 vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.zip | |
svn merge -r522:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Xinput.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Xinput.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c index e9f7f2fb7..822922717 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.c +++ b/xorg-server/hw/xfree86/common/xf86Xinput.c @@ -618,6 +618,7 @@ MergeInputClasses(IDevPtr idev, InputAttributes *attrs) "InputClass configuration"); return BadAlloc; } + mergedopts = xf86ReplaceStrOption(mergedopts, "driver", idev->driver); } idev->commonOptions = xf86optionListMerge(idev->commonOptions, mergedopts); |