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/kernel/setup.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/kernel/setup.c')
| -rw-r--r-- | arch/m68k/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c index 869c4861346e..42d5b85f3350 100644 --- a/arch/m68k/kernel/setup.c +++ b/arch/m68k/kernel/setup.c @@ -64,7 +64,7 @@ static char m68k_command_line[CL_SIZE]; char m68k_debug_device[6] = ""; -void (*mach_sched_init) (irqreturn_t (*handler)(int, void *)) __initdata = NULL; +void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL; /* machine dependent irq functions */ void (*mach_init_IRQ) (void) __initdata = NULL; void (*mach_get_model) (char *model); |