diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2007-03-07 02:28:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 03:08:38 +0100 |
| commit | 8668fb5d8d1bbae1492baf4b8d72b5151a5c4d40 (patch) | |
| tree | ff46236bdffc2698e5286c3d0e7a6146296224af | |
| parent | [PATCH] m68knommu: use irq_handler_t for passing handler types in 68328 setup (diff) | |
| download | linux-8668fb5d8d1bbae1492baf4b8d72b5151a5c4d40.tar.xz linux-8668fb5d8d1bbae1492baf4b8d72b5151a5c4d40.zip | |
[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>
| -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 @@ #include <linux/sched.h> #include <linux/kernel_stat.h> #include <linux/errno.h> +#include <linux/interrupt.h> #include <asm/system.h> #include <asm/irq.h> @@ -64,7 +65,7 @@ asmlinkage void trap44(void); asmlinkage void trap45(void); asmlinkage void trap46(void); asmlinkage void trap47(void); -asmlinkage irqreturn_t bad_interrupt(int, void *, struct pt_regs *); +asmlinkage irqreturn_t bad_interrupt(int, void *); asmlinkage irqreturn_t inthandler(void); asmlinkage irqreturn_t inthandler1(void); asmlinkage irqreturn_t inthandler2(void); @@ -121,7 +122,7 @@ void init_IRQ(void) int request_irq( unsigned int irq, - irqreturn_t (*handler)(int, void *, struct pt_regs *), + irq_handler_t handler, unsigned long flags, const char *devname, void *dev_id) |