Merge branch 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[cascardo/linux.git] / arch / m68k / 68360 / commproc.c

diff --git a/arch/m68k/68360/commproc.c b/arch/m68k/68360/commproc.c
index 315727b..14d7f35 100644 (file)
--- a/arch/m68k/68360/commproc.c
+++ b/arch/m68k/68360/commproc.c
@@ -64,15 +64,15 @@ QUICC  *pquicc;
 
 /* CPM interrupt vector functions. */
 struct cpm_action {
-       void    (*handler)(void *);
-       void    *dev_id;
+       irq_handler_t   handler;
+       void            *dev_id;
 };
 static struct  cpm_action cpm_vecs[CPMVEC_NR];
 static void    cpm_interrupt(int irq, void * dev, struct pt_regs * regs);
 static void    cpm_error_interrupt(void *);
 
 /* prototypes: */
-void cpm_install_handler(int vec, void (*handler)(), void *dev_id);
+void cpm_install_handler(int vec, irq_handler_t handler, void *dev_id);
 void m360_cpm_reset(void);
 
 
@@ -208,7 +208,7 @@ cpm_error_interrupt(void *dev)
 /* Install a CPM interrupt handler.
 */
 void
-cpm_install_handler(int vec, void (*handler)(), void *dev_id)
+cpm_install_handler(int vec, irq_handler_t handler, void *dev_id)
 {
 
        request_irq(vec, handler, 0, "timer", dev_id);