diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-10 08:53:29 -0500 |
| commit | 3afdb0f3528991de0833224f2dba60dc061e01fa (patch) | |
| tree | 0d9c7529c6cc2b41f0df778cc396edd74699721a /arch/arm/mm/Kconfig | |
| parent | 71d8c5b11e3b5936ae6c2e0b1dd6f5c78b305b65 (diff) | |
| parent | f7fdaca910e6bc13659ecdffc28c97938b752e01 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
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 e4509bae8fc..2bd4ccfb353 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -811,7 +811,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH | |||
| 811 | config CACHE_L2X0 | 811 | 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 || ARCH_MX35 || ARCH_MX31 || 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_S5PV310 || ARCH_TEGRA || \ |
| 816 | ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE | 816 | ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE |
| 817 | default y | 817 | default y |