From mboxrd@z Thu Jan 1 00:00:00 1970 From: linus.walleij@linaro.org (Linus Walleij) Date: Thu, 24 Oct 2013 17:04:34 +0200 Subject: [PATCH] ARM: sa1100: fix simpad compilation warning Message-ID: <1382627074-23228-1-git-send-email-linus.walleij@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org When removing the complex GPIO interface from the SA1100 machines, we also removed the implicit #includes for a few header files that was included by thru , causing a compile warning on the simpad boardfile, as was no longer #included, as follows: ./../arch/arm/include/asm/irq.h:9:0: warning: "NR_IRQS" redefined [enabled by default] #define NR_IRQS NR_IRQS_LEGACY ^ In file included from ../../arch/arm/mach-sa1100/simpad.c:29:0: ../../arch/arm/mach-sa1100/include/mach/irqs.h:87:0: note: this is the location of the previous definition #define NR_IRQS (IRQ_BOARD_START + NR_IRQS_LOCOMO) This resolves the problem by explicitly including into the simpad boardfile. Reported-by: Olof Johansson Cc: Russell King Cc: Alexandre Courbot Cc: Kristoffer Ericson Cc: Kevin Hilman Signed-off-by: Linus Walleij --- arch/arm/mach-sa1100/simpad.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index bcbc94540e45..41e476e571d7 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c @@ -19,6 +19,7 @@ #include #include +#include #include #include -- 1.8.3.1