Commit 35f53aaf authored by Russell King's avatar Russell King Committed by Russell King

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2e532d68
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#ifndef __ASM_MACH_IRQS_H
#define __ASM_MACH_IRQS_H
#ifdef CONFIG_PXA_HAVE_ISA_IRQS #ifdef CONFIG_PXA_HAVE_ISA_IRQS
#define PXA_ISA_IRQ(x) (x) #define PXA_ISA_IRQ(x) (x)
...@@ -264,3 +265,5 @@ ...@@ -264,3 +265,5 @@
#endif #endif
#endif /* CONFIG_PCI_HOST_ITE8152 */ #endif /* CONFIG_PCI_HOST_ITE8152 */
#endif /* __ASM_MACH_IRQS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment