Skip to content

Commit 09564b7

Browse files
committed
ARM: lpc32xx: fix NR_IRQS confict
With the change to sparse IRQs, the lpc32xx platform gets a warning about conflicting macros: In file included from arch/arm/mach-lpc32xx/irq.c:31:0: arch/arm/mach-lpc32xx/include/mach/irqs.h:115:0: warning: "NR_IRQS" redefined #define NR_IRQS 96 arch/arm/include/asm/irq.h:9:0: note: this is the location of the previous definition #define NR_IRQS NR_IRQS_LEGACY One such instance was in the old irq driver that is now removed by the previous patch, but any other file including mach/irqs.h still has the issue. Since none of them use this constant, we can just remove the old definition. Signed-off-by: Arnd Bergmann <[email protected]> Fixes: 8cb17b5 ("irqchip: Add LPC32xx interrupt controller driver")
1 parent 342f3f9 commit 09564b7

File tree

1 file changed

+1
-1
lines changed
  • arch/arm/mach-lpc32xx/include/mach

1 file changed

+1
-1
lines changed

arch/arm/mach-lpc32xx/include/mach/irqs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,6 @@
112112
#define IRQ_LPC32XX_GPI_06 LPC32XX_SIC2_IRQ(28)
113113
#define IRQ_LPC32XX_SYSCLK LPC32XX_SIC2_IRQ(31)
114114

115-
#define NR_IRQS 96
115+
#define LPC32XX_NR_IRQS 96
116116

117117
#endif

0 commit comments

Comments
 (0)