diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-03-26 04:48:45 -0400 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-03-26 16:15:30 -0400 |
commit | 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 (patch) | |
tree | e72ff2b8af7523c13c56268935fdde592d1362cd | |
parent | 95fde7a83989d595c06105629f42f3691bf62f91 (diff) |
m68k: irq_node.handler() should return irqreturn_t
commit b5dc7840b3ebe9c7967dd8ba73db957767009ff9 ("m68k: introduce irq
controller") reverted the return type of struct irq_node.handler() from
irqreturn_t to int. Change it back to irqreturn_t, else it will give a
compiler warning when irqreturn_t is turned into an enum in the near future:
| arch/m68k/kernel/ints.c:231: warning: assignment from incompatible pointer type
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r-- | arch/m68k/include/asm/irq_mm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/irq_mm.h b/arch/m68k/include/asm/irq_mm.h index 226bfc0f21b1..0cab42cad79e 100644 --- a/arch/m68k/include/asm/irq_mm.h +++ b/arch/m68k/include/asm/irq_mm.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <linux/linkage.h> | 4 | #include <linux/linkage.h> |
5 | #include <linux/hardirq.h> | 5 | #include <linux/hardirq.h> |
6 | #include <linux/irqreturn.h> | ||
6 | #include <linux/spinlock_types.h> | 7 | #include <linux/spinlock_types.h> |
7 | 8 | ||
8 | /* | 9 | /* |
@@ -80,7 +81,7 @@ struct pt_regs; | |||
80 | * interrupt source (if it supports chaining). | 81 | * interrupt source (if it supports chaining). |
81 | */ | 82 | */ |
82 | typedef struct irq_node { | 83 | typedef struct irq_node { |
83 | int (*handler)(int, void *); | 84 | irqreturn_t (*handler)(int, void *); |
84 | void *dev_id; | 85 | void *dev_id; |
85 | struct irq_node *next; | 86 | struct irq_node *next; |
86 | unsigned long flags; | 87 | unsigned long flags; |