Merge branch 'fixes-omap4-dsp' into fixes-non-critical

diff --combined arch/arm/mach-omap2/mailbox.c
index 19b8b67,f727034..6875be8
--- 1/arch/arm/mach-omap2/mailbox.c
--- 2/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@@ -26,9 -26,9 +26,9 @@@
  #define MAILBOX_IRQSTATUS(u)          (0x100 + 8 * (u))
  #define MAILBOX_IRQENABLE(u)          (0x104 + 8 * (u))
  
 -#define OMAP4_MAILBOX_IRQSTATUS(u)    (0x104 + 10 * (u))
 -#define OMAP4_MAILBOX_IRQENABLE(u)    (0x108 + 10 * (u))
 -#define OMAP4_MAILBOX_IRQENABLE_CLR(u)        (0x10c + 10 * (u))
 +#define OMAP4_MAILBOX_IRQSTATUS(u)    (0x104 + 0x10 * (u))
 +#define OMAP4_MAILBOX_IRQENABLE(u)    (0x108 + 0x10 * (u))
 +#define OMAP4_MAILBOX_IRQENABLE_CLR(u)        (0x10c + 0x10 * (u))
  
  #define MAILBOX_IRQ_NEWMSG(m)         (1 << (2 * (m)))
  #define MAILBOX_IRQ_NOTFULL(m)                (1 << (2 * (m) + 1))
@@@ -83,8 -83,6 +83,6 @@@ static int omap2_mbox_startup(struct om
        l = mbox_read_reg(MAILBOX_REVISION);
        pr_debug("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f));
  
-       omap2_mbox_enable_irq(mbox, IRQ_RX);
- 
        return 0;
  }