aboutsummaryrefslogtreecommitdiff
path: root/arch/tile
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2012-07-25 15:40:50 -0400
committerChris Metcalf <cmetcalf@tilera.com>2012-07-25 18:22:18 -0400
commitd41ca6dfea695777abfa35eaec863bfe2434ca54 (patch)
tree21d8ad5ae2bfb6e6d9e51205756d3a9ef55d9128 /arch/tile
parentbdc0077af574800d24318b6945cf2344e8dbb050 (diff)
downloadlinux-linaro-stable-d41ca6dfea695777abfa35eaec863bfe2434ca54.tar.gz
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 <bhelgaas@google.com> Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile')
-rw-r--r--arch/tile/kernel/pci_gx.c2
1 files changed, 1 insertions, 1 deletions
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;
}