diff options
author | Greg Ungerer <gerg@snapgear.com> | 2007-03-06 20:28:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 21:08:38 -0500 |
commit | 8668fb5d8d1bbae1492baf4b8d72b5151a5c4d40 (patch) | |
tree | ff46236bdffc2698e5286c3d0e7a6146296224af /arch/m68knommu | |
parent | 1ea9acc7823587266a26293a3b74deafc6637427 (diff) |
[PATCH] m68knommu: use irq_handler_t and remove regs arg for 68328
Remove regs arg from bad interrupt handler.
Use irq_handler_t type for handler arg of local request_irq().
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r-- | arch/m68knommu/platform/68328/ints.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/m68knommu/platform/68328/ints.c b/arch/m68knommu/platform/68328/ints.c index 2dda7339aae5..3de6e337554e 100644 --- a/arch/m68knommu/platform/68328/ints.c +++ b/arch/m68knommu/platform/68328/ints.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
16 | #include <linux/kernel_stat.h> | 16 | #include <linux/kernel_stat.h> |
17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
18 | #include <linux/interrupt.h> | ||
18 | 19 | ||
19 | #include <asm/system.h> | 20 | #include <asm/system.h> |
20 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
@@ -64,7 +65,7 @@ asmlinkage void trap44(void); | |||
64 | asmlinkage void trap45(void); | 65 | asmlinkage void trap45(void); |
65 | asmlinkage void trap46(void); | 66 | asmlinkage void trap46(void); |
66 | asmlinkage void trap47(void); | 67 | asmlinkage void trap47(void); |
67 | asmlinkage irqreturn_t bad_interrupt(int, void *, struct pt_regs *); | 68 | asmlinkage irqreturn_t bad_interrupt(int, void *); |
68 | asmlinkage irqreturn_t inthandler(void); | 69 | asmlinkage irqreturn_t inthandler(void); |
69 | asmlinkage irqreturn_t inthandler1(void); | 70 | asmlinkage irqreturn_t inthandler1(void); |
70 | asmlinkage irqreturn_t inthandler2(void); | 71 | asmlinkage irqreturn_t inthandler2(void); |
@@ -121,7 +122,7 @@ void init_IRQ(void) | |||
121 | 122 | ||
122 | int request_irq( | 123 | int request_irq( |
123 | unsigned int irq, | 124 | unsigned int irq, |
124 | irqreturn_t (*handler)(int, void *, struct pt_regs *), | 125 | irq_handler_t handler, |
125 | unsigned long flags, | 126 | unsigned long flags, |
126 | const char *devname, | 127 | const char *devname, |
127 | void *dev_id) | 128 | void *dev_id) |