diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-15 15:14:43 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-15 15:14:43 -0400 |
| commit | 63ae9680564096aecff6f314539c152a6afb75d4 (patch) | |
| tree | d96109562c7e59eec22f9b9d0181a69ce2a364b8 /arch/arm/mm | |
| parent | 8c9e80eeafd55da624552900abe345d62d181856 (diff) | |
| parent | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into linaro-2.6.38
Conflicts:
arch/arm/mach-exynos4/cpufreq.c
arch/arm/mach-exynos4/irq-eint.c
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-ux500/board-mop500-sdi.c
arch/arm/plat-s5p/Makefile
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 89266382b53..0074b8dba79 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -819,8 +819,8 @@ config CACHE_FEROCEON_L2_WRITETHROUGH config CACHE_L2X0 bool "Enable the L2x0 outer cache controller" depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ - REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \ - ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \ + REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \ + ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \ ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE default y select OUTER_CACHE |