Messages in this thread | | | From | Bjorn Helgaas <> | Date | Wed, 25 Jul 2012 15:16:43 -0600 | Subject | Re: [PATCH] tilegx pci: fix semantic merge conflict with 3527ed81c |
| |
On Wed, Jul 25, 2012 at 1:40 PM, Chris Metcalf <cmetcalf@tilera.com> wrote: > 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. > > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
You pushed the other tile changes, so I assume you'll do the same with this one. But let me know if you want me to push it to Linus.
> --- > arch/tile/kernel/pci_gx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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; > > } > > -- > 1.7.10.3 >
| |