diff options
-rw-r--r-- | arch/frv/mb93090-mb00/pci-vdk.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c index f8dd37e49535..6b0b82ff4419 100644 --- a/arch/frv/mb93090-mb00/pci-vdk.c +++ b/arch/frv/mb93090-mb00/pci-vdk.c | |||
@@ -327,11 +327,6 @@ void __init pcibios_fixup_bus(struct pci_bus *bus) | |||
327 | printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number); | 327 | printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number); |
328 | #endif | 328 | #endif |
329 | 329 | ||
330 | if (bus->number == 0) { | ||
331 | bus->resource[0] = &pci_ioport_resource; | ||
332 | bus->resource[1] = &pci_iomem_resource; | ||
333 | } | ||
334 | |||
335 | pci_read_bridge_bases(bus); | 330 | pci_read_bridge_bases(bus); |
336 | 331 | ||
337 | if (bus->number == 0) { | 332 | if (bus->number == 0) { |
@@ -357,6 +352,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus) | |||
357 | int __init pcibios_init(void) | 352 | int __init pcibios_init(void) |
358 | { | 353 | { |
359 | struct pci_ops *dir = NULL; | 354 | struct pci_ops *dir = NULL; |
355 | LIST_HEAD(resources); | ||
360 | 356 | ||
361 | if (!mb93090_mb00_detected) | 357 | if (!mb93090_mb00_detected) |
362 | return -ENXIO; | 358 | return -ENXIO; |
@@ -420,7 +416,10 @@ int __init pcibios_init(void) | |||
420 | } | 416 | } |
421 | 417 | ||
422 | printk("PCI: Probing PCI hardware\n"); | 418 | printk("PCI: Probing PCI hardware\n"); |
423 | pci_root_bus = pci_scan_bus(0, pci_root_ops, NULL); | 419 | pci_add_resource(&resources, &pci_ioport_resource); |
420 | pci_add_resource(&resources, &pci_iomem_resource); | ||
421 | pci_root_bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL, | ||
422 | &resources); | ||
424 | 423 | ||
425 | pcibios_irq_init(); | 424 | pcibios_irq_init(); |
426 | pcibios_fixup_peer_bridges(); | 425 | pcibios_fixup_peer_bridges(); |