aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/at91x40.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-04 07:45:16 +0000
committerArnd Bergmann <arnd@arndb.de>2012-07-04 13:56:48 +0200
commit14070ade02cc378bc30dae383532768a94805988 (patch)
tree3a16ad43bac32ebd0b1cd59b72b7d4c0f144df48 /arch/arm/mach-at91/at91x40.c
parent1fe406186482305bfb77967c59a64367d3fd8088 (diff)
ARM: at91: fix new build errors
MULTI_IRQ_HANDLER and SPARSE_IRQ are now required everywhere because mach/irqs.h and mach/entry-macros.S are gone but the symbols are only selected for AT91SAM9, not for the NOMMU parts. A few files now need to include linux/io.h directly, which used to be included through other headers that have changed. The new at91_aic_irq_priorities variable is only used with CONFIG_OF enabled and should not be visible otherwise. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/at91x40.c')
-rw-r--r--arch/arm/mach-at91/at91x40.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c
index 4c0f5fd4d85..46090e642d8 100644
--- a/arch/arm/mach-at91/at91x40.c
+++ b/arch/arm/mach-at91/at91x40.c
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/irq.h>
+#include <linux/io.h>
#include <asm/proc-fns.h>
#include <asm/system_misc.h>
#include <asm/mach/arch.h>