xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/common/xf86Bus.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4a251f5883b042cd902c192060a0be2b11148f2b
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Fri Nov 8 14:55:33 2013 -0800

    xfree86: Fix build without libpciaccess
    
    Regression fix from commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Reviewed-by: Connor Behan <connor.behan at gmail.com>

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) {