Pull bugzilla-7880 into release branch

[linux-2.6] / arch / um / include / irq_kern.h

diff --git a/arch/um/include/irq_kern.h b/arch/um/include/irq_kern.h
index 81beb1841299a6c0613d76e127dd669f7a000310..4f775597fd5fa3bed63890a8b752f8705f265367 100644 (file)
--- a/arch/um/include/irq_kern.h
+++ b/arch/um/include/irq_kern.h
@@ -10,11 +10,11 @@
 #include "asm/ptrace.h"
 
 extern int um_request_irq(unsigned int irq, int fd, int type,
-                         irqreturn_t (*handler)(int, void *),
+                         irq_handler_t handler,
                          unsigned long irqflags,  const char * devname,
                          void *dev_id);
 extern int init_aio_irq(int irq, char *name,
-                       irqreturn_t (*handler)(int, void *));
+                       irq_handler_t handler);
 
 #endif