aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m68knommu/machdep.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2006-11-20 00:46:22 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-20 13:16:49 -0500
commitace5f1d425beaa272b6e91cecc87b2c075d7feb2 (patch)
tree9445f6ba8d8be95e999fdd2496027cee48713b72 /include/asm-m68knommu/machdep.h
parent49a1cd00b599d12c3f397e5a32f81f6e2aab0d74 (diff)
[PATCH] m68knommu: fix up for the irq_handler_t changes
Switch to using irq_handler_t for interrupt function handler pointers. Change name of m68knommu's irq_hanlder_t data structure so it doesn't clash with the common type (include/linux/interrupt.h). Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68knommu/machdep.h')
-rw-r--r--include/asm-m68knommu/machdep.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68knommu/machdep.h b/include/asm-m68knommu/machdep.h
index 27c90afd3339..6ce28f8e0ead 100644
--- a/include/asm-m68knommu/machdep.h
+++ b/include/asm-m68knommu/machdep.h
@@ -18,7 +18,7 @@ extern int (*mach_kbdrate) (struct kbd_repeat *);
18extern void (*mach_kbd_leds) (unsigned int); 18extern void (*mach_kbd_leds) (unsigned int);
19/* machine dependent irq functions */ 19/* machine dependent irq functions */
20extern void (*mach_init_IRQ) (void); 20extern void (*mach_init_IRQ) (void);
21extern irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *); 21extern irq_handler_t mach_default_handler;
22extern int (*mach_request_irq) (unsigned int irq, void (*handler)(int, void *, struct pt_regs *), 22extern int (*mach_request_irq) (unsigned int irq, void (*handler)(int, void *, struct pt_regs *),
23 unsigned long flags, const char *devname, void *dev_id); 23 unsigned long flags, const char *devname, void *dev_id);
24extern void (*mach_free_irq) (unsigned int irq, void *dev_id); 24extern void (*mach_free_irq) (unsigned int irq, void *dev_id);