diff --git a/[refs] b/[refs] index 100b5ff3dcb5..b0fdc10f9340 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95fde7a83989d595c06105629f42f3691bf62f91 +refs/heads/master: 4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213 diff --git a/trunk/arch/m68k/include/asm/irq_mm.h b/trunk/arch/m68k/include/asm/irq_mm.h index 226bfc0f21b1..0cab42cad79e 100644 --- a/trunk/arch/m68k/include/asm/irq_mm.h +++ b/trunk/arch/m68k/include/asm/irq_mm.h @@ -3,6 +3,7 @@ #include #include +#include #include /* @@ -80,7 +81,7 @@ struct pt_regs; * interrupt source (if it supports chaining). */ typedef struct irq_node { - int (*handler)(int, void *); + irqreturn_t (*handler)(int, void *); void *dev_id; struct irq_node *next; unsigned long flags;