diff options
| author | Greg Ungerer <gerg@snapgear.com> | 2006-11-20 06:46:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-20 19:16:49 +0100 |
| commit | ace5f1d425beaa272b6e91cecc87b2c075d7feb2 (patch) | |
| tree | 9445f6ba8d8be95e999fdd2496027cee48713b72 /include/asm-m68knommu/irqnode.h | |
| parent | [PATCH] fix build error for HISAX_NETJET (diff) | |
| download | linux-ace5f1d425beaa272b6e91cecc87b2c075d7feb2.tar.xz linux-ace5f1d425beaa272b6e91cecc87b2c075d7feb2.zip | |
[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/irqnode.h')
| -rw-r--r-- | include/asm-m68knommu/irqnode.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-m68knommu/irqnode.h b/include/asm-m68knommu/irqnode.h index a2503dfc554c..6132a9858b52 100644 --- a/include/asm-m68knommu/irqnode.h +++ b/include/asm-m68knommu/irqnode.h @@ -8,7 +8,7 @@ * interrupt source (if it supports chaining). */ typedef struct irq_node { - irqreturn_t (*handler)(int, void *, struct pt_regs *); + irq_handler_t handler; unsigned long flags; void *dev_id; const char *devname; @@ -18,12 +18,12 @@ typedef struct irq_node { /* * This structure has only 4 elements for speed reasons */ -typedef struct irq_handler { - irqreturn_t (*handler)(int, void *, struct pt_regs *); +struct irq_entry { + irq_handler_t handler; unsigned long flags; void *dev_id; const char *devname; -} irq_handler_t; +}; /* count of spurious interrupts */ extern volatile unsigned int num_spurious; |