aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/pci/pci.c')
-rw-r--r--arch/mips/pci/pci.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 99d8f4fd3ff4..589b745d822a 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -75,7 +75,7 @@ pcibios_align_resource(void *data, struct resource *res,
75 res->start = start; 75 res->start = start;
76} 76}
77 77
78void __init register_pci_controller(struct pci_controller *hose) 78void __devinit register_pci_controller(struct pci_controller *hose)
79{ 79{
80 if (request_resource(&iomem_resource, hose->mem_resource) < 0) 80 if (request_resource(&iomem_resource, hose->mem_resource) < 0)
81 goto out; 81 goto out;
@@ -141,6 +141,7 @@ static int __init pcibios_init(void)
141 141
142 bus = pci_scan_bus(next_busno, hose->pci_ops, hose); 142 bus = pci_scan_bus(next_busno, hose->pci_ops, hose);
143 hose->bus = bus; 143 hose->bus = bus;
144 need_domain_info = need_domain_info || hose->index;
144 hose->need_domain_info = need_domain_info; 145 hose->need_domain_info = need_domain_info;
145 if (bus) { 146 if (bus) {
146 next_busno = bus->subordinate + 1; 147 next_busno = bus->subordinate + 1;
@@ -230,7 +231,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
230 return pcibios_plat_dev_init(dev); 231 return pcibios_plat_dev_init(dev);
231} 232}
232 233
233static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev, 234static void pcibios_fixup_device_resources(struct pci_dev *dev,
234 struct pci_bus *bus) 235 struct pci_bus *bus)
235{ 236{
236 /* Update device resources. */ 237 /* Update device resources. */
@@ -251,7 +252,7 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
251 } 252 }
252} 253}
253 254
254void __devinit pcibios_fixup_bus(struct pci_bus *bus) 255void pcibios_fixup_bus(struct pci_bus *bus)
255{ 256{
256 /* Propagate hose info into the subordinate devices. */ 257 /* Propagate hose info into the subordinate devices. */
257 258
@@ -282,8 +283,7 @@ pcibios_update_irq(struct pci_dev *dev, int irq)
282 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); 283 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
283} 284}
284 285
285void __devinit 286void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
286pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
287 struct resource *res) 287 struct resource *res)
288{ 288{
289 struct pci_controller *hose = (struct pci_controller *)dev->sysdata; 289 struct pci_controller *hose = (struct pci_controller *)dev->sysdata;