aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/irq.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/kernel/irq.c')
-rw-r--r--arch/sparc/kernel/irq.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index ae4dfc89ca52..b3b6680a2a30 100644
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -134,8 +134,8 @@ static void irq_panic(void)
134 prom_halt(); 134 prom_halt();
135} 135}
136 136
137void (*sparc_init_timers)(irqreturn_t (*)(int, void *)) = 137void (*sparc_init_timers)(irq_handler_t ) =
138 (void (*)(irqreturn_t (*)(int, void *))) irq_panic; 138 (void (*)(irq_handler_t )) irq_panic;
139 139
140/* 140/*
141 * Dave Redman (djhr@tadpole.co.uk) 141 * Dave Redman (djhr@tadpole.co.uk)
@@ -376,7 +376,7 @@ void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
376 * thus no sharing possible. 376 * thus no sharing possible.
377 */ 377 */
378int request_fast_irq(unsigned int irq, 378int request_fast_irq(unsigned int irq,
379 irqreturn_t (*handler)(int, void *), 379 irq_handler_t handler,
380 unsigned long irqflags, const char *devname) 380 unsigned long irqflags, const char *devname)
381{ 381{
382 struct irqaction *action; 382 struct irqaction *action;
@@ -475,7 +475,7 @@ out:
475} 475}
476 476
477int request_irq(unsigned int irq, 477int request_irq(unsigned int irq,
478 irqreturn_t (*handler)(int, void *), 478 irq_handler_t handler,
479 unsigned long irqflags, const char * devname, void *dev_id) 479 unsigned long irqflags, const char * devname, void *dev_id)
480{ 480{
481 struct irqaction * action, **actionp; 481 struct irqaction * action, **actionp;
@@ -485,7 +485,7 @@ int request_irq(unsigned int irq,
485 485
486 if (sparc_cpu_model == sun4d) { 486 if (sparc_cpu_model == sun4d) {
487 extern int sun4d_request_irq(unsigned int, 487 extern int sun4d_request_irq(unsigned int,
488 irqreturn_t (*)(int, void *), 488 irq_handler_t ,
489 unsigned long, const char *, void *); 489 unsigned long, const char *, void *);
490 return sun4d_request_irq(irq, handler, irqflags, devname, dev_id); 490 return sun4d_request_irq(irq, handler, irqflags, devname, dev_id);
491 } 491 }