Commit 5d833a6c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 94a5f850 29e4e982

arch/frv/mb93090-mb00/pci-frv.c

+1 −1
Original line number Diff line number Diff line
@@ -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];