1 files changed, 20 insertions, 7 deletions

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index 8322df174bbf..564114eb85e1 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -312,8 +312,9 @@ common_init_pci(void)
 {
         struct pci_controller *hose;
         struct list_head resources;
+        struct pci_host_bridge *bridge;
         struct pci_bus *bus;
-        int next_busno;
+        int ret, next_busno;
         int need_domain_info = 0;
         u32 pci_mem_end;
         u32 sg_base;
@@ -336,11 +337,25 @@ common_init_pci(void)
                 pci_add_resource_offset(&resources, hose->mem_space,
                                         hose->mem_space->start);
 
-                bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops,
-                                        hose, &resources);
-                if (!bus)
+                bridge = pci_alloc_host_bridge(0);
+                if (!bridge)
                         continue;
-                hose->bus = bus;
+
+                list_splice_init(&resources, &bridge->windows);
+                bridge->dev.parent = NULL;
+                bridge->sysdata = hose;
+                bridge->busnr = next_busno;
+                bridge->ops = alpha_mv.pci_ops;
+                bridge->swizzle_irq = alpha_mv.pci_swizzle;
+                bridge->map_irq = alpha_mv.pci_map_irq;
+
+                ret = pci_scan_root_bus_bridge(bridge);
+                if (ret) {
+                        pci_free_host_bridge(bridge);
+                        continue;
+                }
+
+                bus = hose->bus = bridge->bus;
                 hose->need_domain_info = need_domain_info;
                 next_busno = bus->busn_res.end + 1;
                 /* Don't allow 8-bit bus number overflow inside the hose -
@@ -354,7 +369,6 @@ common_init_pci(void)
         pcibios_claim_console_setup();
 
         pci_assign_unassigned_resources();
-        pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);
         for (hose = hose_head; hose; hose = hose->next) {
                 bus = hose->bus;
                 if (bus)
@@ -362,7 +376,6 @@ common_init_pci(void)
         }
 }
 
-
 struct pci_controller * __init
 alloc_pci_controller(void)
 {