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/sun3x | |
| 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/sun3x')
| -rw-r--r-- | arch/m68k/sun3x/time.c | 2 | ||||
| -rw-r--r-- | arch/m68k/sun3x/time.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c index 33eb1ecc888..f5eaafb00d2 100644 --- a/arch/m68k/sun3x/time.c +++ b/arch/m68k/sun3x/time.c @@ -90,7 +90,7 @@ static void sun3x_timer_tick(int irq, void *dev_id, struct pt_regs *regs) } #endif -void __init sun3x_sched_init(irqreturn_t (*vector)(int, void *)) +void __init sun3x_sched_init(irq_handler_t vector) { sun3_disable_interrupts(); diff --git a/arch/m68k/sun3x/time.h b/arch/m68k/sun3x/time.h index e39079c781d..6909e129753 100644 --- a/arch/m68k/sun3x/time.h +++ b/arch/m68k/sun3x/time.h @@ -3,7 +3,7 @@ extern int sun3x_hwclk(int set, struct rtc_time *t); unsigned long sun3x_gettimeoffset (void); -void sun3x_sched_init(irqreturn_t (*vector)(int, void *)); +void sun3x_sched_init(irq_handler_t vector); struct mostek_dt { volatile unsigned char csr; |