diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 12:12:22 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 12:12:22 -0400 |
| commit | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (patch) | |
| tree | 7a0ebba8b14d889a8b42edfa1272be222b908a82 /arch/arm/Kconfig | |
| parent | 7e1efcf5d2039fb7a91e21df32f4175dbca4d61c (diff) | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) | |
Merge branch 'imx/devel' into next/dt
The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.
Conflicts:
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/memory.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 | ||