Skip to content

Commit

Permalink
tilegx pci: fix semantic merge conflict with 3527ed8
Browse files Browse the repository at this point in the history
Yinghai Lu removed pci_bus.subordinate in pci-next, which meant that
the tile-next changes to add tilegx PCI support don't build.  This
was expected (seen in linux-next) and this one-line fix is along
the same lines as commit b918c62 for all other architectures.

Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
  • Loading branch information
Chris Metcalf committed Jul 25, 2012
1 parent bdc0077 commit d41ca6d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/tile/kernel/pci_gx.c
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ int __init pcibios_init(void)
bus = pci_scan_root_bus(NULL, next_busno, controller->ops,
controller, &resources);
controller->root_bus = bus;
next_busno = bus->subordinate + 1;
next_busno = bus->busn_res.end + 1;

}

Expand Down

0 comments on commit d41ca6d

Please sign in to comment.