diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mm/Kconfig | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mm/Kconfig')
| -rw-r--r-- | arch/arm/mm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index e1fd98fff8fa..33c3f570aaa0 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -771,8 +771,8 @@ config CACHE_L2X0 | |||
| 771 | bool "Enable the L2x0 outer cache controller" | 771 | bool "Enable the L2x0 outer cache controller" |
| 772 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ | 772 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ |
| 773 | REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \ | 773 | REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \ |
| 774 | ARCH_NOMADIK || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \ | 774 | ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \ |
| 775 | ARCH_TEGRA | 775 | ARCH_U8500 || ARCH_VEXPRESS_CA9X4 |
| 776 | default y | 776 | default y |
| 777 | select OUTER_CACHE | 777 | select OUTER_CACHE |
| 778 | select OUTER_CACHE_SYNC | 778 | select OUTER_CACHE_SYNC |