Commit d41ca6df authored Jul 25, 2012 by Chris Metcalf

tilegx pci: fix semantic merge conflict with 3527ed81



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>

parent bdc0077a

arch/tile/kernel/pci_gx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

		}