diff options
author | marha <marha@users.sourceforge.net> | 2014-07-11 18:04:20 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-07-11 18:04:20 +0200 |
commit | 3865d60ef607cbb00c819e905e40d3628b8eca29 (patch) | |
tree | 73d8064951a7abbe4897bcc25959463d08544495 /xorg-server/hw/xfree86/common/xf86AutoConfig.c | |
parent | 294a395f15dec9e7aa24b83b08f47ba54b9bd232 (diff) | |
parent | e708bebcc029873004ade4241f347ce8c58896af (diff) | |
download | vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.tar.gz vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.tar.bz2 vcxsrv-3865d60ef607cbb00c819e905e40d3628b8eca29.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86AutoConfig.c')
-rw-r--r-- | xorg-server/hw/xfree86/common/xf86AutoConfig.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c index 4eb86de22..2b53b908a 100644 --- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c +++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c @@ -265,7 +265,7 @@ listPossibleVideoDrivers(char *matches[], int nmatches) #endif #ifdef XSERVER_LIBPCIACCESS if (i < (nmatches - 1)) - i = xf86PciMatchDriver(matches, nmatches); + i += xf86PciMatchDriver(&matches[i], nmatches - i); #endif #if defined(__linux__) |