diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 14:18:33 -0500 |
| commit | 0a3a98f6dd4e8f4d928a09302c0d1c56f2192ac3 (patch) | |
| tree | 92f55e374a84d06ce8213a4540454760fdecf137 /include/asm-arm/irq.h | |
| parent | 8ef12c9f01afba47c2d33bb939085111ca0d0f7d (diff) | |
| parent | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (diff) | |
Merge Linus' tree.
Diffstat (limited to 'include/asm-arm/irq.h')
| -rw-r--r-- | include/asm-arm/irq.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/asm-arm/irq.h b/include/asm-arm/irq.h index 59975ee43cf1..7772432d3fd7 100644 --- a/include/asm-arm/irq.h +++ b/include/asm-arm/irq.h | |||
| @@ -25,10 +25,14 @@ extern void disable_irq_nosync(unsigned int); | |||
| 25 | extern void disable_irq(unsigned int); | 25 | extern void disable_irq(unsigned int); |
| 26 | extern void enable_irq(unsigned int); | 26 | extern void enable_irq(unsigned int); |
| 27 | 27 | ||
| 28 | #define __IRQT_FALEDGE (1 << 0) | 28 | /* |
| 29 | #define __IRQT_RISEDGE (1 << 1) | 29 | * These correspond with the SA_TRIGGER_* defines, and therefore the |
| 30 | #define __IRQT_LOWLVL (1 << 2) | 30 | * IRQRESOURCE_IRQ_* defines. |
| 31 | #define __IRQT_HIGHLVL (1 << 3) | 31 | */ |
| 32 | #define __IRQT_RISEDGE (1 << 0) | ||
| 33 | #define __IRQT_FALEDGE (1 << 1) | ||
| 34 | #define __IRQT_HIGHLVL (1 << 2) | ||
| 35 | #define __IRQT_LOWLVL (1 << 3) | ||
| 32 | 36 | ||
| 33 | #define IRQT_NOEDGE (0) | 37 | #define IRQT_NOEDGE (0) |
| 34 | #define IRQT_RISING (__IRQT_RISEDGE) | 38 | #define IRQT_RISING (__IRQT_RISEDGE) |