aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/au1000/common/irq.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 14:29:26 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-09 14:29:26 -0700
commit9b6d99f48dfc27d6009e134a5d771eaefd75faac (patch)
tree5131841a5df84ad9564dad19f11f9d1a0e0085bb /arch/mips/au1000/common/irq.c
parentMerge branch 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 (diff)
parentIRQ: Use the new typedef for interrupt handler function pointers (diff)
downloadlinux-dev-9b6d99f48dfc27d6009e134a5d771eaefd75faac.tar.xz
linux-dev-9b6d99f48dfc27d6009e134a5d771eaefd75faac.zip
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6: IRQ: Use the new typedef for interrupt handler function pointers
Diffstat (limited to 'arch/mips/au1000/common/irq.c')
-rw-r--r--arch/mips/au1000/common/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index b32597e05a69..2abe132bb07d 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -288,7 +288,7 @@ static struct irq_chip level_irq_type = {
};
#ifdef CONFIG_PM
-void startup_match20_interrupt(irqreturn_t (*handler)(int, void *))
+void startup_match20_interrupt(irq_handler_t handler)
{
struct irq_desc *desc = &irq_desc[AU1000_TOY_MATCH2_INT];