diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:24:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:24:28 -0400 |
| commit | 7e0cac630c7c90f12a78131df9913657fa30243b (patch) | |
| tree | c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6 /arch/arm/Kconfig | |
| parent | 94314a40bcc537c396012e37cf887572f0d82aef (diff) | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) | |
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 | |||
| 413 | select CLKSRC_MMIO | 413 | select CLKSRC_MMIO |
| 414 | select GENERIC_IRQ_CHIP | 414 | select GENERIC_IRQ_CHIP |
| 415 | select HAVE_SCHED_CLOCK | 415 | select HAVE_SCHED_CLOCK |
| 416 | select MULTI_IRQ_HANDLER | ||
| 416 | help | 417 | help |
| 417 | Support for Freescale MXC/iMX-based family of processors | 418 | Support for Freescale MXC/iMX-based family of processors |
| 418 | 419 | ||