summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-10-25 19:23:30 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-29 15:01:01 +0400
commit9a48aa4cafa994161d21e14b454f7191cf180ec3 (patch)
tree4d7294834baa0bf9554d3048a03fe5c9a6e7d80c /arch/arm/mach-sa1100
parent272b98c6455f00884f0350f775c5342358ebb73f (diff)
downloadlinux-9a48aa4cafa994161d21e14b454f7191cf180ec3.tar.xz
ARM: 7865/1: sa1100: fix simpad compilation warning
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 <linux/gpio.h> thru <mach/gpio.h>, causing a compile warning on the simpad boardfile, as <asm/irq.h> 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 <asm/irq.h> into the simpad boardfile. Reported-by: Olof Johansson <olof@lixom.net> Cc: Alexandre Courbot <acourbot@nvidia.com> Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com> Cc: Kevin Hilman <khilman@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r--arch/arm/mach-sa1100/simpad.c1
1 files changed, 1 insertions, 0 deletions
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 <mach/hardware.h>
#include <asm/setup.h>
+#include <asm/irq.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>