diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 18:20:21 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 18:20:21 +0400 |
| commit | 7f9c7e28119cf21ae1a035240da3705647d0d06a (patch) | |
| tree | c0a1568e21c5ce6cd4112e44071040a3e611a9ec /arch/arm/mach-pxa/include/mach/magician.h | |
| parent | 4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (diff) | |
| parent | b476ef059ec9e49d4f2a4280b862b446ef3866e8 (diff) | |
| download | linux-7f9c7e28119cf21ae1a035240da3705647d0d06a.tar.xz | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/magician.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/magician.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h index 20ef37d4a9a7..0a2efcf7947c 100644 --- a/arch/arm/mach-pxa/include/mach/magician.h +++ b/arch/arm/mach-pxa/include/mach/magician.h @@ -71,6 +71,8 @@ #define IRQ_MAGICIAN_BT (IRQ_BOARD_START + 2) #define IRQ_MAGICIAN_VBUS (IRQ_BOARD_START + 3) +#define MAGICIAN_NR_IRQS (IRQ_BOARD_START + 8) + /* * CPLD EGPIOs */ |