aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 14:24:28 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 14:24:28 +0100
commit7e0cac630c7c90f12a78131df9913657fa30243b (patch)
treec09aa76b07a9bcb0ab0dea4885909421f7a9f4a6 /arch/arm/Kconfig
parent94314a40bcc537c396012e37cf887572f0d82aef (diff)
parentb4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff)
downloadkernel_samsung_smdk4412-7e0cac630c7c90f12a78131df9913657fa30243b.zip
kernel_samsung_smdk4412-7e0cac630c7c90f12a78131df9913657fa30243b.tar.gz
kernel_samsung_smdk4412-7e0cac630c7c90f12a78131df9913657fa30243b.tar.bz2
Merge branch 'imx/devel' into imx/imx6q
Conflicts: arch/arm/plat-mxc/include/mach/memory.h
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0c5f37f..a94a09b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -413,6 +413,7 @@ config ARCH_MXC
select CLKSRC_MMIO
select GENERIC_IRQ_CHIP
select HAVE_SCHED_CLOCK
+ select MULTI_IRQ_HANDLER
help
Support for Freescale MXC/iMX-based family of processors