diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
| commit | 3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4 (patch) | |
| tree | 7d729e347d8860c9ef5631cb8cdfa96e892f86d5 /arch/arm/mm | |
| parent | MAINTAINERS: add maintainer of CSR SiRFprimaII machine (diff) | |
| parent | ARM: Xilinx: merge board file into main platform code (diff) | |
| download | linux-dev-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.tar.xz linux-dev-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.zip | |
Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index edf0681c0e29..a0ea5848d40d 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -821,7 +821,8 @@ config CACHE_L2X0 depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \ ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \ - ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || ARCH_PRIMA2 + ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \ + ARCH_PRIMA2 || ARCH_ZYNQ default y select OUTER_CACHE select OUTER_CACHE_SYNC |