xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/os-support/bus/Pci.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 8a06ff9ffa4816d192e58e43e7fe569b97b4dd7c (from 928836a5abd85466e920eb487fab9ccb295e0c5b)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Thu Jun 28 16:41:28 2007 -0400

    Fix another usage of MAX_PCI_DEVICES.
    
    Fixes cases where the VGA device is above the 128th device on the system.

diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index bc5e11f..30f7667 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -1093,7 +1093,7 @@ xf86GetPciConfigFromTag(PCITAG Tag)
     pciConfigPtr pDev;
     int i = 0;
 
-    for (i = 0 ; (pDev = pci_devp[i]) && i <= MAX_PCI_DEVICES; i++) {
+    for (i = 0 ; (pDev = pci_devp[i]) && i <= xf86MaxPciDevs; i++) {
 	if (Tag == pDev->tag)
 	    return pDev;
     }