Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

[karo-tx-linux.git] / arch / frv / mb93090-mb00 / pci-vdk.c

diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index f8dd37e495353f978ca3c4725e330909384d7a58..6b0b82ff4419e70e806fa835b9d7327b9642ac52 100644 (file)
--- 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)
        printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);
 #endif
 
-       if (bus->number == 0) {
-               bus->resource[0] = &pci_ioport_resource;
-               bus->resource[1] = &pci_iomem_resource;
-       }
-
        pci_read_bridge_bases(bus);
 
        if (bus->number == 0) {
@@ -357,6 +352,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
 int __init pcibios_init(void)
 {
        struct pci_ops *dir = NULL;
+       LIST_HEAD(resources);
 
        if (!mb93090_mb00_detected)
                return -ENXIO;
@@ -420,7 +416,10 @@ int __init pcibios_init(void)
        }
 
        printk("PCI: Probing PCI hardware\n");
-       pci_root_bus = pci_scan_bus(0, pci_root_ops, NULL);
+       pci_add_resource(&resources, &pci_ioport_resource);
+       pci_add_resource(&resources, &pci_iomem_resource);
+       pci_root_bus = pci_scan_root_bus(NULL, 0, pci_root_ops, NULL,
+                                        &resources);
 
        pcibios_irq_init();
        pcibios_fixup_peer_bridges();