diff options
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r-- | include/linux/irq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index c38dbd506656..32efca71ce88 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -55,9 +55,9 @@ typedef void (*irq_flow_handler_t)(unsigned int irq, | |||
55 | #define IRQ_INPROGRESS 0x00000100 /* DEPRECATED */ | 55 | #define IRQ_INPROGRESS 0x00000100 /* DEPRECATED */ |
56 | #define IRQ_REPLAY 0x00000200 /* DEPRECATED */ | 56 | #define IRQ_REPLAY 0x00000200 /* DEPRECATED */ |
57 | #define IRQ_WAITING 0x00000400 /* DEPRECATED */ | 57 | #define IRQ_WAITING 0x00000400 /* DEPRECATED */ |
58 | #define IRQ_DISABLED 0x00000800 /* DEPRECATED */ | ||
58 | #endif | 59 | #endif |
59 | 60 | ||
60 | #define IRQ_DISABLED 0x00000800 /* IRQ disabled - do not enter! */ | ||
61 | #define IRQ_PENDING 0x00001000 /* IRQ pending - replay on enable */ | 61 | #define IRQ_PENDING 0x00001000 /* IRQ pending - replay on enable */ |
62 | 62 | ||
63 | #define IRQ_LEVEL 0x00004000 /* IRQ level triggered */ | 63 | #define IRQ_LEVEL 0x00004000 /* IRQ level triggered */ |
@@ -231,7 +231,7 @@ struct irq_chip { | |||
231 | # define ARCH_IRQ_INIT_FLAGS 0 | 231 | # define ARCH_IRQ_INIT_FLAGS 0 |
232 | #endif | 232 | #endif |
233 | 233 | ||
234 | #define IRQ_DEFAULT_INIT_FLAGS (IRQ_DISABLED | ARCH_IRQ_INIT_FLAGS) | 234 | #define IRQ_DEFAULT_INIT_FLAGS ARCH_IRQ_INIT_FLAGS |
235 | 235 | ||
236 | struct irqaction; | 236 | struct irqaction; |
237 | extern int setup_irq(unsigned int irq, struct irqaction *new); | 237 | extern int setup_irq(unsigned int irq, struct irqaction *new); |