diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 12:30:31 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 12:30:31 +0200 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/mach-pxa/include/mach/irqs.h | |
| parent | Merge branches 'l2', 'pgt2' and 'misc' into for-linus (diff) | |
| parent | Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-b0df89868006517417251e02cc4ce5d4b0165885.tar.xz linux-b0df89868006517417251e02cc4ce5d4b0165885.zip | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/irqs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 32975adf3ca4..8765782dd955 100644 --- a/arch/arm/mach-pxa/include/mach/irqs.h +++ b/arch/arm/mach-pxa/include/mach/irqs.h @@ -100,7 +100,7 @@ */ #define IRQ_BOARD_START (PXA_GPIO_IRQ_BASE + PXA_NR_BUILTIN_GPIO) -#define NR_IRQS (IRQ_BOARD_START) +#define PXA_NR_IRQS (IRQ_BOARD_START) #ifndef __ASSEMBLY__ struct irq_data; |