From: Chris Metcalf <cmetcalf@tilera.com>
Date: Wed, 25 Jul 2012 19:40:50 +0000 (-0400)
Subject: tilegx pci: fix semantic merge conflict with 3527ed81c
X-Git-Tag: v3.6-rc1~87^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d41ca6dfea695777abfa35eaec863bfe2434ca54;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.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 <bhelgaas@google.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
---

diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index fa75264..0e213e3 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;
 
 	}