Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[~andy/linux] / arch / mn10300 / unit-asb2305 / pci.c

diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c
index 6911e845b8cdff49dc85f50f91d2f905c3e2f1c1..1adcf024bb9a4c2221ae93bce8558d85c0b64abb 100644 (file)
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
@@ -24,7 +24,6 @@
 unsigned int pci_probe = 1;
 
 int pcibios_last_bus = -1;
-struct pci_bus *pci_root_bus;
 struct pci_ops *pci_root_ops;
 
 /*
@@ -377,8 +376,7 @@ static int __init pcibios_init(void)
 
        pci_add_resource_offset(&resources, &pci_ioport_resource, io_offset);
        pci_add_resource_offset(&resources, &pci_iomem_resource, mem_offset);
-       pci_root_bus = pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL,
-                                        &resources);
+       pci_scan_root_bus(NULL, 0, &pci_direct_ampci, NULL, &resources);
 
        pcibios_irq_init();
        pcibios_fixup_irqs();