diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-20 16:30:32 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-20 16:30:32 -0500 |
commit | 5d833a6ce87fba95d1afafddfeaaf42d7f19a4a0 (patch) | |
tree | 6f88ee7aa6ef12f9c527b27c270a21157b2314ee | |
parent | 94a5f850aead02f02f350d401a43c4bf9a9fbf3a (diff) | |
parent | 29e4e982b5ae7718b897652268837dc1f0035414 (diff) |
Merge branch 'pci/list-for-each-entry' into next
* pci/list-for-each-entry:
PCI: frv: replace now removed pci_bus_b() causing build failure
-rw-r--r-- | arch/frv/mb93090-mb00/pci-frv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c index c28121765448..67b1d1685759 100644 --- a/arch/frv/mb93090-mb00/pci-frv.c +++ b/arch/frv/mb93090-mb00/pci-frv.c | |||
@@ -88,7 +88,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) | |||
88 | 88 | ||
89 | /* Depth-First Search on bus tree */ | 89 | /* Depth-First Search on bus tree */ |
90 | for (ln=bus_list->next; ln != bus_list; ln=ln->next) { | 90 | for (ln=bus_list->next; ln != bus_list; ln=ln->next) { |
91 | bus = pci_bus_b(ln); | 91 | bus = list_entry(ln, struct pci_bus, node); |
92 | if ((dev = bus->self)) { | 92 | if ((dev = bus->self)) { |
93 | for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) { | 93 | for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) { |
94 | r = &dev->resource[idx]; | 94 | r = &dev->resource[idx]; |