diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 12:32:47 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 12:32:47 -0400 |
| commit | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (patch) | |
| tree | dcb8a23b0245d3d4d2719d7ea987f7eee608c553 /arch/arm/mm/Kconfig | |
| parent | 9b963f32c38b4c7d2da667e4458967b550f30bee (diff) | |
| parent | b0b6ff0b21057bb8e58b0be8b427a4713fd4b5a5 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mm/Kconfig')
| -rw-r--r-- | arch/arm/mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 2bd4ccfb3538..c2eafd993bc3 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -812,7 +812,7 @@ config CACHE_L2X0 | |||
| 812 | bool "Enable the L2x0 outer cache controller" | 812 | bool "Enable the L2x0 outer cache controller" |
| 813 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ | 813 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ |
| 814 | REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \ | 814 | REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \ |
| 815 | ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \ | 815 | ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \ |
| 816 | ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE | 816 | ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE |
| 817 | default y | 817 | default y |
| 818 | select OUTER_CACHE | 818 | select OUTER_CACHE |