Skip to content

Commit

Permalink
ARM: lpc32xx: fix NR_IRQS confict
Browse files Browse the repository at this point in the history
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: 8cb17b5 ("irqchip: Add LPC32xx interrupt controller driver")
  • Loading branch information
Arnd Bergmann committed May 24, 2016
1 parent 342f3f9 commit 09564b7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-lpc32xx/include/mach/irqs.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,6 @@
#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

0 comments on commit 09564b7

Please sign in to comment.