From 4e611091f859906c28921cf8d3c75a848fd249bd Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 3 Jan 2012 16:53:48 -0600 Subject: ARM: pxa: remove NR_IRQS Remove NR_IRQS and add a per machine .nr_irqs setting. Signed-off-by: Rob Herring --- arch/arm/mach-pxa/include/mach/irqs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-pxa/include/mach') diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 32975adf3ca..8765782dd95 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; -- cgit v1.2.3-70-g09d2 From dc38d82676d87a21a0f924cb1728f869412749a9 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 23 Feb 2012 14:30:51 +0100 Subject: ARM: 7344/1: pxa: mainstone: add missing include for IRQ_BOARD_START As part of mach/irqs.h include removal from sparse, mainstone.h was missed. This fixes the compile of the pcmcia driver. Signed-off-by: Rob Herring Signed-off-by: Russell King --- arch/arm/mach-pxa/include/mach/mainstone.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-pxa/include/mach') diff --git a/arch/arm/mach-pxa/include/mach/mainstone.h b/arch/arm/mach-pxa/include/mach/mainstone.h index 4c2d11cd824..1bfc4e822a4 100644 --- a/arch/arm/mach-pxa/include/mach/mainstone.h +++ b/arch/arm/mach-pxa/include/mach/mainstone.h @@ -13,6 +13,8 @@ #ifndef ASM_ARCH_MAINSTONE_H #define ASM_ARCH_MAINSTONE_H +#include + #define MST_ETH_PHYS PXA_CS4_PHYS #define MST_FPGA_PHYS PXA_CS2_PHYS -- cgit v1.2.3-70-g09d2