aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/pci-ip27.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/pci/pci-ip27.c')
-rw-r--r--arch/mips/pci/pci-ip27.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
index 7f4f49b09b5b..6eb65e44d9e4 100644
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
@@ -30,7 +30,7 @@
30 30
31/* 31/*
32 * XXX: No kmalloc available when we do our crosstalk scan, 32 * XXX: No kmalloc available when we do our crosstalk scan,
33 * we should try to move it later in the boot process. 33 * we should try to move it later in the boot process.
34 */ 34 */
35static struct bridge_controller bridges[MAX_PCI_BUSSES]; 35static struct bridge_controller bridges[MAX_PCI_BUSSES];
36 36
@@ -103,7 +103,7 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid)
103 * swap pio's to pci mem and io space (big windows) 103 * swap pio's to pci mem and io space (big windows)
104 */ 104 */
105 bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | 105 bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP |
106 BRIDGE_CTRL_MEM_SWAP; 106 BRIDGE_CTRL_MEM_SWAP;
107#ifdef CONFIG_PAGE_SIZE_4KB 107#ifdef CONFIG_PAGE_SIZE_4KB
108 bridge->b_wid_control &= ~BRIDGE_CTRL_PAGE_SIZE; 108 bridge->b_wid_control &= ~BRIDGE_CTRL_PAGE_SIZE;
109#else /* 16kB or larger */ 109#else /* 16kB or larger */
@@ -123,7 +123,7 @@ int __cpuinit bridge_probe(nasid_t nasid, int widget_id, int masterwid)
123 bridge->b_device[slot].reg |= BRIDGE_DEV_SWAP_DIR; 123 bridge->b_device[slot].reg |= BRIDGE_DEV_SWAP_DIR;
124 bc->pci_int[slot] = -1; 124 bc->pci_int[slot] = -1;
125 } 125 }
126 bridge->b_wid_tflush; /* wait until Bridge PIO complete */ 126 bridge->b_wid_tflush; /* wait until Bridge PIO complete */
127 127
128 bc->base = bridge; 128 bc->base = bridge;
129 129
@@ -184,7 +184,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
184} 184}
185 185
186/* 186/*
187 * Device might live on a subordinate PCI bus. XXX Walk up the chain of buses 187 * Device might live on a subordinate PCI bus. XXX Walk up the chain of buses
188 * to find the slot number in sense of the bridge device register. 188 * to find the slot number in sense of the bridge device register.
189 * XXX This also means multiple devices might rely on conflicting bridge 189 * XXX This also means multiple devices might rely on conflicting bridge
190 * settings. 190 * settings.