summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-02-20 14:30:32 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-02-20 14:30:32 -0700
commit5d833a6ce87fba95d1afafddfeaaf42d7f19a4a0 (patch)
tree6f88ee7aa6ef12f9c527b27c270a21157b2314ee /arch
parent94a5f850aead02f02f350d401a43c4bf9a9fbf3a (diff)
parent29e4e982b5ae7718b897652268837dc1f0035414 (diff)
downloadlinux-stable-5d833a6ce87fba95d1afafddfeaaf42d7f19a4a0.tar.gz
linux-stable-5d833a6ce87fba95d1afafddfeaaf42d7f19a4a0.tar.bz2
linux-stable-5d833a6ce87fba95d1afafddfeaaf42d7f19a4a0.zip
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
Diffstat (limited to 'arch')
-rw-r--r--arch/frv/mb93090-mb00/pci-frv.c2
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)
/* Depth-First Search on bus tree */
for (ln=bus_list->next; ln != bus_list; ln=ln->next) {
- bus = pci_bus_b(ln);
+ bus = list_entry(ln, struct pci_bus, node);
if ((dev = bus->self)) {
for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {
r = &dev->resource[idx];