aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-04 03:45:16 -0400
committerArnd Bergmann <arnd@arndb.de>2012-07-04 07:56:48 -0400
commit14070ade02cc378bc30dae383532768a94805988 (patch)
tree3a16ad43bac32ebd0b1cd59b72b7d4c0f144df48 /arch/arm/mach-at91/Kconfig
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/Kconfig')
-rw-r--r--arch/arm/mach-at91/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 7d0c40a74d4d..c8050b14e615 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -37,6 +37,8 @@ config SOC_AT91SAM9
37config SOC_AT91RM9200 37config SOC_AT91RM9200
38 bool "AT91RM9200" 38 bool "AT91RM9200"
39 select CPU_ARM920T 39 select CPU_ARM920T
40 select MULTI_IRQ_HANDLER
41 select SPARSE_IRQ
40 select GENERIC_CLOCKEVENTS 42 select GENERIC_CLOCKEVENTS
41 select HAVE_AT91_DBGU0 43 select HAVE_AT91_DBGU0
42 44
@@ -142,6 +144,8 @@ config ARCH_AT91SAM9G45
142config ARCH_AT91X40 144config ARCH_AT91X40
143 bool "AT91x40" 145 bool "AT91x40"
144 depends on !MMU 146 depends on !MMU
147 select MULTI_IRQ_HANDLER
148 select SPARSE_IRQ
145 select ARCH_USES_GETTIMEOFFSET 149 select ARCH_USES_GETTIMEOFFSET
146 150
147endchoice 151endchoice