From 4a251f5883b042cd902c192060a0be2b11148f2b Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Fri, 8 Nov 2013 14:55:33 -0800 Subject: [PATCH] xfree86: Fix build without libpciaccess Regression fix from commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639 Signed-off-by: Jeremy Huddleston Sequoia Reviewed-by: Connor Behan --- hw/xfree86/common/xf86Bus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) {