diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 14:29:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 14:29:26 -0700 |
| commit | 9b6d99f48dfc27d6009e134a5d771eaefd75faac (patch) | |
| tree | 5131841a5df84ad9564dad19f11f9d1a0e0085bb /arch/m68k/q40/q40ints.c | |
| parent | 5a43c09d1b65da614620b1985633e3251b4f9b99 (diff) | |
| parent | 40220c1a192f51695f806d75b1f9970f0f17a6e8 (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/q40/q40ints.c')
| -rw-r--r-- | arch/m68k/q40/q40ints.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c index 4a4ee4dfa6f..31cc07d8cec 100644 --- a/arch/m68k/q40/q40ints.c +++ b/arch/m68k/q40/q40ints.c @@ -125,7 +125,7 @@ void q40_mksound(unsigned int hz, unsigned int ticks) sound_ticks = ticks << 1; } -static irqreturn_t (*q40_timer_routine)(int, void *); +static irq_handler_t q40_timer_routine; static irqreturn_t q40_timer_int (int irq, void * dev) { @@ -142,7 +142,7 @@ static irqreturn_t q40_timer_int (int irq, void * dev) return IRQ_HANDLED; } -void q40_sched_init (irqreturn_t (*timer_routine)(int, void *)) +void q40_sched_init (irq_handler_t timer_routine) { int timer_irq; |