summaryrefslogtreecommitdiff
path: root/arch/arm/plat-omap/mailbox.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-19 09:23:07 +0200
committerIngo Molnar <mingo@elte.hu>2008-05-19 09:23:07 +0200
commita8ac1ae3a2a8ceb5bc1d334a502d42f59b91379c (patch)
treefa3c8e81ffa64798e85425cf139fdd6ba3fd7963 /arch/arm/plat-omap/mailbox.c
parentb4ef290d7c3abd1bf8cefcf8def359537fda7f31 (diff)
parentb8291ad07a7f3b5b990900f0001198ac23ba893e (diff)
Merge branch 'linus' into x86/pattip-x86-pat-2008-05-19-07-23-07
Diffstat (limited to 'arch/arm/plat-omap/mailbox.c')
-rw-r--r--arch/arm/plat-omap/mailbox.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 1945ddfec18d..6f33f58bca45 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -355,7 +355,6 @@ static int omap_mbox_init(struct omap_mbox *mbox)
"failed to register mailbox interrupt:%d\n", ret);
goto fail_request_irq;
}
- enable_mbox_irq(mbox, IRQ_RX);
mq = mbox_queue_alloc(mbox, mbox_txq_fn, mbox_tx_work);
if (!mq) {