diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 07:30:20 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 07:42:17 -0500 |
| commit | 237c78beb8a988453bac1993d21f025d070a0d8d (patch) | |
| tree | 9864f0924650770881141359a2d5bac623949789 /arch/arm/plat-mxc/Kconfig | |
| parent | 4eb821999086417ab42a15174b51497122fc406e (diff) | |
| parent | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff) | |
Merge branch 'depends/rmk/for-linus' into samsung/dt
Conflicts:
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/cpu.c -> common.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-exynos/init.c -> common.c
arch/arm/mach-s5p64x0/init.c -> common.c
arch/arm/mach-s5pv210/init.c -> common.c
Multiple files were moved into common.c files in the rmk/for-linus
branch, so this moves over the samsung/dt changes to the new
files.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-mxc/Kconfig')
| -rw-r--r-- | arch/arm/plat-mxc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index b3a1f2b3ada3..b30708e28c1d 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig | |||
| @@ -20,6 +20,7 @@ config ARCH_IMX_V6_V7 | |||
| 20 | bool "i.MX3, i.MX6" | 20 | bool "i.MX3, i.MX6" |
| 21 | select AUTO_ZRELADDR if !ZBOOT_ROM | 21 | select AUTO_ZRELADDR if !ZBOOT_ROM |
| 22 | select ARM_PATCH_PHYS_VIRT | 22 | select ARM_PATCH_PHYS_VIRT |
| 23 | select MIGHT_HAVE_CACHE_L2X0 | ||
| 23 | help | 24 | help |
| 24 | This enables support for systems based on the Freescale i.MX3 and i.MX6 | 25 | This enables support for systems based on the Freescale i.MX3 and i.MX6 |
| 25 | family. | 26 | family. |