diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
| commit | cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (patch) | |
| tree | 91ed73daada51bddd5652fd847f30b3593ecff04 /xorg-server/hw/xfree86/common | |
| parent | 6d8fefe38077f4d532c256e79cfcaf2a46c5269d (diff) | |
| parent | 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (diff) | |
| download | vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.gz vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.bz2 vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver pixman git update 9 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/Xext/shm.c
Diffstat (limited to 'xorg-server/hw/xfree86/common')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Bus.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Bus.c b/xorg-server/hw/xfree86/common/xf86Bus.c index 329d0b3d5..d463e9196 100644 --- a/xorg-server/hw/xfree86/common/xf86Bus.c +++ b/xorg-server/hw/xfree86/common/xf86Bus.c @@ -266,9 +266,12 @@ xf86IsEntityPrimary(int entityIndex) { EntityPtr pEnt = xf86Entities[entityIndex]; +#ifdef XSERVER_LIBPCIACCESS if (primaryBus.type == BUS_PLATFORM && pEnt->bus.type == BUS_PCI) return MATCH_PCI_DEVICES(pEnt->bus.id.pci, primaryBus.id.plat->pdev); - else if (primaryBus.type != pEnt->bus.type) +#endif + + if (primaryBus.type != pEnt->bus.type) return FALSE; switch (pEnt->bus.type) { |