Merge branch 'next' into for-linus

Second round of updates for 3.20.

1 files changed, 8 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index cbb908dc5cf0..9025ffffd2dc 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -3534,9 +3534,15 @@ int omap_hwmod_fill_resources(struct omap_hwmod *oh, struct resource *res)
 
         mpu_irqs_cnt = _count_mpu_irqs(oh);
         for (i = 0; i < mpu_irqs_cnt; i++) {
+                unsigned int irq;
+
+                if (oh->xlate_irq)
+                        irq = oh->xlate_irq((oh->mpu_irqs + i)->irq);
+                else
+                        irq = (oh->mpu_irqs + i)->irq;
                 (res + r)->name = (oh->mpu_irqs + i)->name;
-                (res + r)->start = (oh->mpu_irqs + i)->irq;
-                (res + r)->end = (oh->mpu_irqs + i)->irq;
+                (res + r)->start = irq;
+                (res + r)->end = irq;
                 (res + r)->flags = IORESOURCE_IRQ;
                 r++;
         }