[MIPS] Declare some pci variables in header file

[linux-2.6-omap-h63xx.git] / arch / mips / pci / pci-ip27.c

diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
index a322543ac34e257223f66cb4f3bd684c60eb9537..ce92f82b16d26f884b5ebc288ed4bcd36d1790ff 100644 (file)
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
@@ -40,7 +40,7 @@ int irq_to_slot[MAX_PCI_BUSSES * MAX_DEVICES_PER_PCIBUS];
 
 extern struct pci_ops bridge_pci_ops;
 
-int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid)
+int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid)
 {
        unsigned long offset = NODE_OFFSET(nasid);
        struct bridge_controller *bc;
@@ -48,6 +48,8 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid)
        bridge_t *bridge;
        int slot;
 
+       pci_probe_only = 1;
+
        printk("a bridge\n");
 
        /* XXX: kludge alert.. */
@@ -100,6 +102,11 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid)
         */
        bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP |
                                 BRIDGE_CTRL_MEM_SWAP;
+#ifdef CONFIG_PAGE_SIZE_4KB
+       bridge->b_wid_control &= ~BRIDGE_CTRL_PAGE_SIZE;
+#else /* 16kB or larger */
+       bridge->b_wid_control |= BRIDGE_CTRL_PAGE_SIZE;
+#endif
 
        /*
         * Hmm...  IRIX sets additional bits in the address which