summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 14:07:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 14:07:19 +0100
commit2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch)
tree15ab3c23d05e98829741b03922b51b81fd102b64 /arch/arm/mm/Kconfig
parent500b9fc922cbec572f4fd1436533bfaed5011262 (diff)
parenta68fefe0d2f364ac3d8497ef37dcad713c261103 (diff)
downloadop-kernel-dev-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.zip
op-kernel-dev-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.tar.gz
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mm/Kconfig')
-rw-r--r--arch/arm/mm/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 87ec141..d6ffcee 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -771,7 +771,8 @@ 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_U8500 || ARCH_VEXPRESS_CA9X4
+ ARCH_NOMADIK || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
+ ARCH_S5PV310
default y
select OUTER_CACHE
select OUTER_CACHE_SYNC
OpenPOWER on IntegriCloud