ARM: lpc32xx: fix NR_IRQS confict
authorArnd Bergmann <arnd@arndb.de>
Thu, 19 May 2016 08:31:31 +0000 (10:31 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 24 May 2016 19:32:46 +0000 (19:32 +0000)
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 <arnd@arndb.de>
Fixes: 8cb17b5ed017 ("irqchip: Add LPC32xx interrupt controller driver")

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

index 9e3b90df32e1626c3858367910a2b446369d279d..00190535df9061ad6750bcac1f1a07ce65173574 100644 (file)
 #define IRQ_LPC32XX_GPI_06             LPC32XX_SIC2_IRQ(28)
 #define IRQ_LPC32XX_SYSCLK             LPC32XX_SIC2_IRQ(31)
 
-#define NR_IRQS                                96
+#define LPC32XX_NR_IRQS                        96
 
 #endif