Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[pandora-kernel.git] / arch / powerpc / platforms / maple / pci.c

diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index f40451d..9a4efc0 100644 (file)
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -316,7 +316,6 @@ static int __init add_bridge(struct device_node *dev)
        char* disp_name;
        int *bus_range;
        int primary = 1;
-       struct property *of_prop;
 
        DBG("Adding PCI host bridge %s\n", dev->full_name);
 
@@ -436,11 +435,8 @@ void __init maple_pci_init(void)
                        PCI_DN(np)->busno = 0xf0;
        }
 
-       /* Tell pci.c to use the common resource allocation mecanism */
-       pci_probe_only = 0;
-       
-       /* Allow all IO */
-       io_page_mask = -1;
+       /* Tell pci.c to not change any resource allocations.  */
+       pci_probe_only = 1;
 }
 
 int maple_pci_get_legacy_ide_irq(struct pci_dev *pdev, int channel)