diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 23:28:06 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 23:28:06 +0200 |
| commit | 4338925434e4bf5ff714055713f3fb9b5fae9037 (patch) | |
| tree | 2c764e61af011f71b97c1d4b5113b47265d3e03d /arch/arm/mm/Kconfig | |
| parent | Merge tag 'sunxi-core-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ARM: Kirkwood: Remove mach-kirkwood (diff) | |
| download | linux-4338925434e4bf5ff714055713f3fb9b5fae9037.tar.xz linux-4338925434e4bf5ff714055713f3fb9b5fae9037.zip | |
Merge tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu into next/soc
Merge "ARM: mvebu SoC changes for v3.17 (round 2)" from Jason Cooper:
"Yeah, it's just one patch, but it's a beautiful one! Thanks to the
efforts of many people over the last couple years, and in particular,
Andrew Lunn, Kirkwood has been completely converted to DT."
- kirkwood
* Remove mach-kirkwood/, It's fully supported in mach-mvebu/
* tag 'mvebu-soc-3.17-2' of git://git.infradead.org/linux-mvebu:
ARM: Kirkwood: Remove mach-kirkwood
Signed-off-by: Olof Johansson <olof@lixom.net>
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 c348eaee7ee2..c35f0ec9c929 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -854,7 +854,7 @@ config OUTER_CACHE_SYNC config CACHE_FEROCEON_L2 bool "Enable the Feroceon L2 cache controller" - depends on ARCH_KIRKWOOD || ARCH_MV78XX0 || ARCH_MVEBU + depends on ARCH_MV78XX0 || ARCH_MVEBU default y select OUTER_CACHE help |