Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c
index 2cb7e75ba1c0..6d8720a0a599 100644
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
@@ -331,12 +331,10 @@ static int __init pci_check_direct(void)
 static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
 {
         unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
-        struct resource *devr = &dev->resource[idx];
+        struct resource *devr = &dev->resource[idx], *busr;
 
         if (dev->bus) {
-                for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
-                        struct resource *busr = dev->bus->resource[i];
-
+                pci_bus_for_each_resource(dev->bus, busr, i) {
                         if (!busr || (busr->flags ^ devr->flags) & type_mask)
                                 continue;