diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-28 00:07:30 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 00:07:30 -0700 |
| commit | 53e6a100f78a9723970ca5e0ad5857de8ad399ae (patch) | |
| tree | aed24ca201079970177bf63b4ef7ab93a2fb39be /arch/arm/mach-omap2/mailbox.c | |
| parent | 00a3669838a02de2ae139bdb13c1019aa427a442 (diff) | |
| parent | 222e5cec47a54ff3dde72e7dfba10c67da3adca0 (diff) | |
Merge branch 'fixes-omap4-dsp' into fixes-non-critical
Diffstat (limited to 'arch/arm/mach-omap2/mailbox.c')
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 19b8b677486..6875be837d9 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -83,8 +83,6 @@ static int omap2_mbox_startup(struct omap_mbox *mbox) 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; } |