diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-13 09:56:24 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-13 09:56:24 +0100 |
commit | 74b8721099992b76d3faff78cb8a5d13c65c3529 (patch) | |
tree | 2c9971160051cae98237715f791ce2b93a0720b5 /arch/arm/mm/Kconfig | |
parent | 4bddaf66093ce0e0c1fce505f091f4cd52e73e2e (diff) | |
parent | baffe1699c68da5040de6b274054adc995795782 (diff) | |
download | op-kernel-dev-74b8721099992b76d3faff78cb8a5d13c65c3529.zip op-kernel-dev-74b8721099992b76d3faff78cb8a5d13c65c3529.tar.gz |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-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 d3022da..3e62aae2 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -771,7 +771,7 @@ config CACHE_L2X0 config CACHE_TAUROS2 bool "Enable the Tauros2 L2 cache controller" - depends on ARCH_DOVE + depends on (ARCH_DOVE || ARCH_MMP) default y select OUTER_CACHE help |