diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
| commit | c99da91e7a12724127475a85cc7a38214b3504e2 (patch) | |
| tree | de0eb3fe32ce58804457963fd133a53bb8fba5b8 /include/asm-blackfin/mach-bf537/irq.h | |
| parent | a31e23e15cbb9734c5883a4a7f58d8712d303e0b (diff) | |
| parent | 92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-blackfin/mach-bf537/irq.h')
| -rw-r--r-- | include/asm-blackfin/mach-bf537/irq.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-blackfin/mach-bf537/irq.h b/include/asm-blackfin/mach-bf537/irq.h index 36c44bc1a917..be6f2ff77f31 100644 --- a/include/asm-blackfin/mach-bf537/irq.h +++ b/include/asm-blackfin/mach-bf537/irq.h | |||
| @@ -162,11 +162,7 @@ Core Emulation ** | |||
| 162 | 162 | ||
| 163 | #define GPIO_IRQ_BASE IRQ_PF0 | 163 | #define GPIO_IRQ_BASE IRQ_PF0 |
| 164 | 164 | ||
| 165 | #ifdef CONFIG_IRQCHIP_DEMUX_GPIO | ||
| 166 | #define NR_IRQS (IRQ_PH15+1) | 165 | #define NR_IRQS (IRQ_PH15+1) |
| 167 | #else | ||
| 168 | #define NR_IRQS (IRQ_UART1_ERROR+1) | ||
| 169 | #endif | ||
| 170 | 166 | ||
| 171 | #define IVG7 7 | 167 | #define IVG7 7 |
| 172 | #define IVG8 8 | 168 | #define IVG8 8 |