diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
| commit | abc3f126ac736280c68db6472eb0040ddf6e1b1f (patch) | |
| tree | 4e3333cde6da6c49dcd81920410bf5a33055f03a /arch/arm/mm | |
| parent | b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea (diff) | |
| parent | 8bcb97659656042f3132b2814b19709856aa1335 (diff) | |
| download | op-kernel-dev-abc3f126ac736280c68db6472eb0040ddf6e1b1f.zip op-kernel-dev-abc3f126ac736280c68db6472eb0040ddf6e1b1f.tar.gz | |
Merge branch 'imx/imx6q' into next/soc
Conflicts:
Documentation/devicetree/bindings/arm/fsl.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/plat-mxc/include/mach/common.h
Diffstat (limited to 'arch/arm/mm')
| -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 7d5fff7..67f75a0 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -819,7 +819,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH config CACHE_L2X0 bool "Enable the L2x0 outer cache controller" depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ - REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \ + REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \ ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \ ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \ ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_HIGHBANK |
