Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[linux-imx.git] / arch / microblaze / pci / pci-common.c

diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index ca8f6e76996026b42f1d8fcd034ad17948f60b05..4dbb5055d04b9c274796e2d9d4d832b533333d83 100644 (file)
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -192,11 +192,6 @@ void pcibios_set_master(struct pci_dev *dev)
        /* No special bus mastering setup handling */
 }
 
-char __devinit *pcibios_setup(char *str)
-{
-       return str;
-}
-
 /*
  * Reads the interrupt pin to determine if interrupt is use by card.
  * If the interrupt is used, then gets the interrupt line from the
@@ -1504,10 +1499,10 @@ static void __devinit pcibios_scan_phb(struct pci_controller *hose)
                pci_free_resource_list(&resources);
                return;
        }
-       bus->secondary = hose->first_busno;
+       bus->busn_res.start = hose->first_busno;
        hose->bus = bus;
 
-       hose->last_busno = bus->subordinate;
+       hose->last_busno = bus->busn_res.end;
 }
 
 static int __init pcibios_init(void)