diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 06:50:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 06:50:52 -0400 |
| commit | 701038144945ef98c5817f43079952fa38c35999 (patch) | |
| tree | 88782f6ac8e4df1f7f8f738659adedd7108e8cae /arch/arm/mm | |
| parent | 4abf27add86e5b7c37dca1fb4dd9a740b4332a84 (diff) | |
| parent | c2b455474e4c6bc8bab6506e2a08dbd5ad50d74d (diff) | |
Merge branch 'nomadik' into devel-stable
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 83c025e72ceb..5fe595aeba69 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -758,7 +758,7 @@ config CACHE_FEROCEON_L2_WRITETHROUGH | |||
| 758 | config CACHE_L2X0 | 758 | config CACHE_L2X0 |
| 759 | bool "Enable the L2x0 outer cache controller" | 759 | bool "Enable the L2x0 outer cache controller" |
| 760 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ | 760 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ |
| 761 | REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX | 761 | REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || ARCH_NOMADIK |
| 762 | default y | 762 | default y |
| 763 | select OUTER_CACHE | 763 | select OUTER_CACHE |
| 764 | help | 764 | help |