diff options
Diffstat (limited to 'arch/m68k/68360/commproc.c')
-rw-r--r-- | arch/m68k/68360/commproc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/68360/commproc.c b/arch/m68k/68360/commproc.c index 315727b7ff40..14d7f35cd37b 100644 --- a/arch/m68k/68360/commproc.c +++ b/arch/m68k/68360/commproc.c | |||
@@ -64,15 +64,15 @@ QUICC *pquicc; | |||
64 | 64 | ||
65 | /* CPM interrupt vector functions. */ | 65 | /* CPM interrupt vector functions. */ |
66 | struct cpm_action { | 66 | struct cpm_action { |
67 | void (*handler)(void *); | 67 | irq_handler_t handler; |
68 | void *dev_id; | 68 | void *dev_id; |
69 | }; | 69 | }; |
70 | static struct cpm_action cpm_vecs[CPMVEC_NR]; | 70 | static struct cpm_action cpm_vecs[CPMVEC_NR]; |
71 | static void cpm_interrupt(int irq, void * dev, struct pt_regs * regs); | 71 | static void cpm_interrupt(int irq, void * dev, struct pt_regs * regs); |
72 | static void cpm_error_interrupt(void *); | 72 | static void cpm_error_interrupt(void *); |
73 | 73 | ||
74 | /* prototypes: */ | 74 | /* prototypes: */ |
75 | void cpm_install_handler(int vec, void (*handler)(), void *dev_id); | 75 | void cpm_install_handler(int vec, irq_handler_t handler, void *dev_id); |
76 | void m360_cpm_reset(void); | 76 | void m360_cpm_reset(void); |
77 | 77 | ||
78 | 78 | ||
@@ -208,7 +208,7 @@ cpm_error_interrupt(void *dev) | |||
208 | /* Install a CPM interrupt handler. | 208 | /* Install a CPM interrupt handler. |
209 | */ | 209 | */ |
210 | void | 210 | void |
211 | cpm_install_handler(int vec, void (*handler)(), void *dev_id) | 211 | cpm_install_handler(int vec, irq_handler_t handler, void *dev_id) |
212 | { | 212 | { |
213 | 213 | ||
214 | request_irq(vec, handler, 0, "timer", dev_id); | 214 | request_irq(vec, handler, 0, "timer", dev_id); |