diff --git a/[refs] b/[refs] index dae3e49037db..623c6dacb704 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43f7775944e40221827e4b3aec43824aa4c4e4a9 +refs/heads/master: f210be198ddd3f54b17d4aa6e69b829f75f226e5 diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h index ca8d2a849cff..0d8eaf3e4036 100644 --- a/trunk/include/linux/irq.h +++ b/trunk/include/linux/irq.h @@ -55,6 +55,7 @@ #define IRQ_TYPE_EDGE_BOTH (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING) #define IRQ_TYPE_LEVEL_HIGH 0x0004 /* Level high type */ #define IRQ_TYPE_LEVEL_LOW 0x0008 /* Level low type */ +#define IRQ_TYPE_SENSE_MASK 0x000f /* Mask of the above */ #define IRQ_TYPE_SIMPLE 0x0010 /* Simple type */ #define IRQ_TYPE_PERCPU 0x0020 /* Per CPU type */ #define IRQ_TYPE_PROBE 0x0040 /* Probing in progress */