diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
| commit | 97fb1dadc6c52adeba0ac0684129520288ab794f (patch) | |
| tree | 6a3b54bec00abec5b571087dd001a33d62bf488c /xorg-server/hw/xfree86/common/xf86Init.c | |
| parent | b99cdb7509cad0b99761d19fe99637177913412b (diff) | |
| parent | d41bc08d1ae8c4784c09d8977816c0fadab1ba52 (diff) | |
| download | vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.gz vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.bz2 vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/swrast/s_readpix.c
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Init.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c index a0fdf29ad..c1e48eed2 100644 --- a/xorg-server/hw/xfree86/common/xf86Init.c +++ b/xorg-server/hw/xfree86/common/xf86Init.c @@ -827,6 +827,8 @@ InitInput(int argc, char **argv) /* Initialize all configured input devices */ for (pInfo = xf86ConfigLayout.inputs; pInfo && *pInfo; pInfo++) { + (*pInfo)->options = xf86AddNewOption((*pInfo)->options, "driver", (*pInfo)->driver); + (*pInfo)->options = xf86AddNewOption((*pInfo)->options, "identifier", (*pInfo)->name); /* If one fails, the others will too */ if (NewInputDeviceRequest((*pInfo)->options, NULL, &dev) == BadAlloc) break; |