diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 16:43:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 16:43:51 -0400 |
| commit | 37d7035da5b1f184c610b038b376c0c647d8d72b (patch) | |
| tree | c38d4058ad3232f985d9ed4501a8a842a2a47028 /include/asm-arm/arch-pxa/irqs.h | |
| parent | 0fc3ff31f1f0fa023bb61e9336a7aa3591f2dffe (diff) | |
| parent | 54b238469bce3a1b5012b2f0ebf261cf1c53e664 (diff) | |
Merge branch 'pxa-devel' into pxa
Diffstat (limited to 'include/asm-arm/arch-pxa/irqs.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/irqs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/irqs.h b/include/asm-arm/arch-pxa/irqs.h index fa05e76f64e8..9413121b0ed9 100644 --- a/include/asm-arm/arch-pxa/irqs.h +++ b/include/asm-arm/arch-pxa/irqs.h | |||
| @@ -185,6 +185,8 @@ | |||
| 185 | defined(CONFIG_MACH_PCM027) || \ | 185 | defined(CONFIG_MACH_PCM027) || \ |
| 186 | defined(CONFIG_MACH_MAGICIAN) | 186 | defined(CONFIG_MACH_MAGICIAN) |
| 187 | #define NR_IRQS (IRQ_BOARD_END) | 187 | #define NR_IRQS (IRQ_BOARD_END) |
| 188 | #elif defined(CONFIG_MACH_ZYLONITE) | ||
| 189 | #define NR_IRQS (IRQ_BOARD_START + 32) | ||
| 188 | #else | 190 | #else |
| 189 | #define NR_IRQS (IRQ_BOARD_START) | 191 | #define NR_IRQS (IRQ_BOARD_START) |
| 190 | #endif | 192 | #endif |