diff options
| author | Arnd Bergmann | 2011-10-31 14:24:28 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2011-10-31 14:24:28 +0100 |
| commit | 7e0cac630c7c90f12a78131df9913657fa30243b (patch) | |
| tree | c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6 /arch/arm/Kconfig | |
| parent | Merge branch 'dt/gic' into imx/imx6q (diff) | |
| parent | Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linu... (diff) | |
| download | kernel-qcow2-linux-7e0cac630c7c90f12a78131df9913657fa30243b.tar.gz kernel-qcow2-linux-7e0cac630c7c90f12a78131df9913657fa30243b.tar.xz kernel-qcow2-linux-7e0cac630c7c90f12a78131df9913657fa30243b.zip | |
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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0c5f37f4eddb..a94a09ba356b 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 |