diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2013-11-08 14:55:33 -0800 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2013-11-13 08:55:49 -0800 |
| commit | 7ddc6f7f1ed0e0f85b2d617c59d75d5de1cd2d5a (patch) | |
| tree | 1f602f6e24999ba08b6d360f9521beb1cd3c93db | |
| parent | c6fd9c11f7302f4ac77bce37687c8bbffbf8ed65 (diff) | |
xfree86: Fix build without libpciaccess
Regression fix from commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Connor Behan <connor.behan@gmail.com>
(cherry picked from commit 4a251f5883b042cd902c192060a0be2b11148f2b)
| -rw-r--r-- | hw/xfree86/common/xf86Bus.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 329d0b3d5..d463e9196 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/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) { |