diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-05 22:19:03 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-05 22:19:03 +0100 |
commit | 0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7 (patch) | |
tree | a91d4934ac4ffda651804b30554bb6da5af572d4 /arch/arm/mach-prima2/include/mach/irqs.h | |
parent | ARM: nomadik: fix OF compilation regression (diff) | |
parent | ARM: tegra: remove empty tegra_smp_init_cpus() (diff) | |
download | linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.tar.xz linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.zip |
Merge branch 'next/soc' into next/dt
Diffstat (limited to 'arch/arm/mach-prima2/include/mach/irqs.h')
-rw-r--r-- | arch/arm/mach-prima2/include/mach/irqs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-prima2/include/mach/irqs.h b/arch/arm/mach-prima2/include/mach/irqs.h index f6014a07541f..b778a0f248ed 100644 --- a/arch/arm/mach-prima2/include/mach/irqs.h +++ b/arch/arm/mach-prima2/include/mach/irqs.h @@ -10,8 +10,8 @@ #define __ASM_ARCH_IRQS_H #define SIRFSOC_INTENAL_IRQ_START 0 -#define SIRFSOC_INTENAL_IRQ_END 59 +#define SIRFSOC_INTENAL_IRQ_END 127 #define SIRFSOC_GPIO_IRQ_START (SIRFSOC_INTENAL_IRQ_END + 1) -#define NR_IRQS 220 +#define NR_IRQS 288 #endif |