提交 d41ca6df 编写于 作者: C 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: NBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: NChris Metcalf <cmetcalf@tilera.com>
上级 bdc0077a
...@@ -853,7 +853,7 @@ int __init pcibios_init(void) ...@@ -853,7 +853,7 @@ int __init pcibios_init(void)
bus = pci_scan_root_bus(NULL, next_busno, controller->ops, bus = pci_scan_root_bus(NULL, next_busno, controller->ops,
controller, &resources); controller, &resources);
controller->root_bus = bus; controller->root_bus = bus;
next_busno = bus->subordinate + 1; next_busno = bus->busn_res.end + 1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册