summaryrefslogtreecommitdiff
path: root/arch/m68k/atari/time.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/m68k/atari/time.c
parent5a43c09d1b65da614620b1985633e3251b4f9b99 (diff)
parent40220c1a192f51695f806d75b1f9970f0f17a6e8 (diff)
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/m68k/atari/time.c')
-rw-r--r--arch/m68k/atari/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c
index b8fe71cfc62c..c44df4a4a331 100644
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
@@ -20,7 +20,7 @@
#include <asm/atariints.h>
void __init
-atari_sched_init(irqreturn_t (*timer_routine)(int, void *))
+atari_sched_init(irq_handler_t timer_routine)
{
/* set Timer C data Register */
mfp.tim_dt_c = INT_TICKS;