Regression fix from commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
Signed-off-by: Jeremy Huddleston Sequoia <[email protected]>
CC: Connor Behan <[email protected]>
CC: Keith Packard <[email protected]>
CC: Matt Dew <[email protected]>
---
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 329d0b3..d463e91 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) {
--
1.8.4.2
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
