diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-17 08:19:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-17 08:19:08 -0400 |
| commit | 35f53aafb60ebc3a26e5508e0e87bfc88c703654 (patch) | |
| tree | ba43701bf6ee0a3503afb3668a458bb38d615b3d /arch/arm/mach-pxa | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
[ARM] pxa: fix redefinition of NR_IRQS
arch/arm/mach-pxa/include/mach/irqs.h:193:1: warning: "NR_IRQS" redefined
arch/arm/mach-pxa/include/mach/irqs.h:263:1: warning: this is the location of the previous definition
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/irqs.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 9c163e19ada9..32bb4a2eb7f1 100644 --- a/arch/arm/mach-pxa/include/mach/irqs.h +++ b/arch/arm/mach-pxa/include/mach/irqs.h | |||
| @@ -9,7 +9,8 @@ | |||
| 9 | * it under the terms of the GNU General Public License version 2 as | 9 | * it under the terms of the GNU General Public License version 2 as |
| 10 | * published by the Free Software Foundation. | 10 | * published by the Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | 12 | #ifndef __ASM_MACH_IRQS_H | |
| 13 | #define __ASM_MACH_IRQS_H | ||
| 13 | 14 | ||
| 14 | #ifdef CONFIG_PXA_HAVE_ISA_IRQS | 15 | #ifdef CONFIG_PXA_HAVE_ISA_IRQS |
| 15 | #define PXA_ISA_IRQ(x) (x) | 16 | #define PXA_ISA_IRQ(x) (x) |
| @@ -264,3 +265,5 @@ | |||
| 264 | #endif | 265 | #endif |
| 265 | 266 | ||
| 266 | #endif /* CONFIG_PCI_HOST_ITE8152 */ | 267 | #endif /* CONFIG_PCI_HOST_ITE8152 */ |
| 268 | |||
| 269 | #endif /* __ASM_MACH_IRQS_H */ | ||