diff options
author | Tony Lindgren <tony@atomide.com> | 2012-05-17 16:44:43 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-17 16:44:43 -0700 |
commit | 222e5cec47a54ff3dde72e7dfba10c67da3adca0 (patch) | |
tree | ab6bfda54629ca8bcc806f8749cefec0751da888 /arch/arm/mach-omap2/mailbox.c | |
parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
parent | 7548c09a475039b5e9179615ac4c1c58b930cdb5 (diff) |
Merge branch 'for-tony' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/linux into fixes-omap4-dsp
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 415a6f1cf41..f727034216a 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; } |