diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 08:33:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 08:33:23 -0700 |
commit | 9eb200748878751310cd9848c5dd4d467960beec (patch) | |
tree | 16458876279abbc597843a7c1bb8216474691380 /arch/sh/cchips/voyagergx | |
parent | 8770c018da7bbaa3b41371abc401b2aa7e76a71a (diff) | |
parent | 8ae91b9ad88a130cd50fc0b78b16e7b9510b8067 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: SH-4A UBC support
sh: interrupt exception handling rework
sh: Default enable R7780RP IRQs.
sh: Zero-out coherent buffer in consistent_alloc().
sh: Convert IPR-IRQ to IRQ chip.
sh: Convert INTC2 IRQ handler to irq_chip.
sh: Fix pr_debug statements for sh4
sh: Convert r7780rp IRQ handler to IRQ chip.
sh: Updates for IRQ handler changes.
sh: Kill off timer_ops get_frequency().
sh: First step at generic timeofday support.
Diffstat (limited to 'arch/sh/cchips/voyagergx')
-rw-r--r-- | arch/sh/cchips/voyagergx/irq.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c index 392c8b12ce3..bf1b28feca0 100644 --- a/arch/sh/cchips/voyagergx/irq.c +++ b/arch/sh/cchips/voyagergx/irq.c @@ -88,8 +88,7 @@ static struct hw_interrupt_type voyagergx_irq_type = { .end = end_voyagergx_irq, }; -static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t voyagergx_interrupt(int irq, void *dev_id) { printk(KERN_INFO "VoyagerGX: spurious interrupt, status: 0x%x\n", |