diff -Naurp linux-2.6.17-rc5.orig/arch/mips/pci/pci.c linux-2.6.17-rc5/arch/mips/pci/pci.c --- linux-2.6.17-rc5.orig/arch/mips/pci/pci.c 2006-03-20 00:53:29.000000000 -0500 +++ linux-2.6.17-rc5/arch/mips/pci/pci.c 2006-06-04 02:19:06.000000000 -0400 @@ -20,11 +20,19 @@ * Make this long-lived so that we know when shutting down * whether we probed only or not. */ +#ifdef CONFIG_SGI_IP27 +int pci_probe_only = 1; +#else int pci_probe_only; +#endif #define PCI_ASSIGN_ALL_BUSSES 1 +#ifdef CONFIG_SGI_IP27 +unsigned int pci_probe; +#else unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES; +#endif /* * The PCI controller list. @@ -119,10 +127,12 @@ static int __init pcibios_init(void) /* Scan all of the recorded PCI controllers. */ for (next_busno = 0, hose = hose_head; hose; hose = hose->next) { +#ifndef CONFIG_SGI_IP27 if (request_resource(&iomem_resource, hose->mem_resource) < 0) goto out; if (request_resource(&ioport_resource, hose->io_resource) < 0) goto out_free_mem_resource; +#endif if (!hose->iommu) PCI_DMA_BUS_IS_PHYS = 1;