diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/include/irq_kern.h | 4 | ||||
-rw-r--r-- | arch/um/kernel/irq.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/include/irq_kern.h b/arch/um/include/irq_kern.h index 81beb1841299..4f775597fd5f 100644 --- a/arch/um/include/irq_kern.h +++ b/arch/um/include/irq_kern.h | |||
@@ -10,11 +10,11 @@ | |||
10 | #include "asm/ptrace.h" | 10 | #include "asm/ptrace.h" |
11 | 11 | ||
12 | extern int um_request_irq(unsigned int irq, int fd, int type, | 12 | extern int um_request_irq(unsigned int irq, int fd, int type, |
13 | irqreturn_t (*handler)(int, void *), | 13 | irq_handler_t handler, |
14 | unsigned long irqflags, const char * devname, | 14 | unsigned long irqflags, const char * devname, |
15 | void *dev_id); | 15 | void *dev_id); |
16 | extern int init_aio_irq(int irq, char *name, | 16 | extern int init_aio_irq(int irq, char *name, |
17 | irqreturn_t (*handler)(int, void *)); | 17 | irq_handler_t handler); |
18 | 18 | ||
19 | #endif | 19 | #endif |
20 | 20 | ||
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 3c01c2bc979a..ef259569fd8c 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
@@ -364,7 +364,7 @@ unsigned int do_IRQ(int irq, union uml_pt_regs *regs) | |||
364 | } | 364 | } |
365 | 365 | ||
366 | int um_request_irq(unsigned int irq, int fd, int type, | 366 | int um_request_irq(unsigned int irq, int fd, int type, |
367 | irqreturn_t (*handler)(int, void *), | 367 | irq_handler_t handler, |
368 | unsigned long irqflags, const char * devname, | 368 | unsigned long irqflags, const char * devname, |
369 | void *dev_id) | 369 | void *dev_id) |
370 | { | 370 | { |
@@ -425,7 +425,7 @@ void __init init_IRQ(void) | |||
425 | } | 425 | } |
426 | } | 426 | } |
427 | 427 | ||
428 | int init_aio_irq(int irq, char *name, irqreturn_t (*handler)(int, void *)) | 428 | int init_aio_irq(int irq, char *name, irq_handler_t handler) |
429 | { | 429 | { |
430 | int fds[2], err; | 430 | int fds[2], err; |
431 | 431 | ||