diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-12 22:43:51 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 22:43:51 +0200 |
commit | 37d7035da5b1f184c610b038b376c0c647d8d72b (patch) | |
tree | c38d4058ad3232f985d9ed4501a8a842a2a47028 /include/asm-arm/arch-pxa/irqs.h | |
parent | [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper (diff) | |
parent | [ARM] 5113/1: PXA SSP: Additional register definitions for PXA3xx SSP (diff) | |
download | linux-37d7035da5b1f184c610b038b376c0c647d8d72b.tar.xz linux-37d7035da5b1f184c610b038b376c0c647d8d72b.zip |
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 @@ defined(CONFIG_MACH_PCM027) || \ defined(CONFIG_MACH_MAGICIAN) #define NR_IRQS (IRQ_BOARD_END) +#elif defined(CONFIG_MACH_ZYLONITE) +#define NR_IRQS (IRQ_BOARD_START + 32) #else #define NR_IRQS (IRQ_BOARD_START) #endif |