From: Chris Metcalf Date: Wed, 25 Jul 2012 19:40:50 +0000 (-0400) Subject: tilegx pci: fix semantic merge conflict with 3527ed81c X-Git-Tag: MMI-PSA29.97-13-9~16264^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d41ca6dfea695777abfa35eaec863bfe2434ca54;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git tilegx pci: fix semantic merge conflict with 3527ed81c 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 b918c62e for all other architectures. Acked-by: Bjorn Helgaas Signed-off-by: Chris Metcalf --- diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index fa75264a82ae..0e213e35ffc3 100644 --- a/arch/tile/kernel/pci_gx.c +++ b/arch/tile/kernel/pci_gx.c @@ -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; }