diff options
| author | Russell King | 2008-10-17 14:19:08 +0200 |
|---|---|---|
| committer | Russell King | 2008-10-17 14:19:08 +0200 |
| commit | 35f53aafb60ebc3a26e5508e0e87bfc88c703654 (patch) | |
| tree | ba43701bf6ee0a3503afb3668a458bb38d615b3d /arch/arm/mach-pxa/include/mach/irqs.h | |
| parent | {pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol() (diff) | |
| download | kernel-qcow2-linux-35f53aafb60ebc3a26e5508e0e87bfc88c703654.tar.gz kernel-qcow2-linux-35f53aafb60ebc3a26e5508e0e87bfc88c703654.tar.xz kernel-qcow2-linux-35f53aafb60ebc3a26e5508e0e87bfc88c703654.zip | |
[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/include/mach/irqs.h')
| -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 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - +#ifndef __ASM_MACH_IRQS_H +#define __ASM_MACH_IRQS_H #ifdef CONFIG_PXA_HAVE_ISA_IRQS #define PXA_ISA_IRQ(x) (x) @@ -264,3 +265,5 @@ #endif #endif /* CONFIG_PCI_HOST_ITE8152 */ + +#endif /* __ASM_MACH_IRQS_H */ |