From: Russell King Date: Fri, 17 Oct 2008 12:19:08 +0000 (+0100) Subject: [ARM] pxa: fix redefinition of NR_IRQS X-Git-Tag: v2.6.28-rc1~63^2~12 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=35f53aafb60ebc3a26e5508e0e87bfc88c703654;p=linux-2.6-omap-h63xx.git [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 --- diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h index 9c163e19ada..32bb4a2eb7f 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 */