diff options
| author | Arnd Bergmann | 2015-12-16 00:02:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2015-12-16 00:56:18 +0100 |
| commit | 22ba14f41ca6b7f96fe3d4a8eb116358060595fd (patch) | |
| tree | fbc59ebf82556cd604b1946304c61e64c4469caf /arch/arm/mm | |
| parent | Merge branch 'versatile/multiplatform' into next/multiplatform (diff) | |
| parent | ARM: realview: add an DT SMP boot method (diff) | |
| download | kernel-qcow2-linux-22ba14f41ca6b7f96fe3d4a8eb116358060595fd.tar.gz kernel-qcow2-linux-22ba14f41ca6b7f96fe3d4a8eb116358060595fd.tar.xz kernel-qcow2-linux-22ba14f41ca6b7f96fe3d4a8eb116358060595fd.zip | |
Merge tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/multiplatform
Merge "Realview multiplatform support" from Linus Walleij:
The board and infrastructure changes for RealView
multiplatform and extended DT support.
* tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: realview: add an DT SMP boot method
ARM: realview: select SP810 and ICST for the DT variant
soc: versatile: add support for the PB11MPCore
clk: versatile-icst: add device tree support
clk: versatile-icst: refactor to allocate regmap separately
clk: versatile-icst: convert to use regmap
ARM: realview: remove private barrier implementation
ARM: no longer force unbuffered DMA for realview
clk/realview: stop using machine headers
ARM: realview: don't map undefined PCI registers
ARM: realview: remove sparsemem hack
Conflicts:
drivers/clk/versatile/Kconfig
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 41218867a9a6..76f65f2d59b1 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -1005,8 +1005,6 @@ config ARM_L1_CACHE_SHIFT config ARM_DMA_MEM_BUFFERABLE bool "Use non-cacheable memory for DMA" if (CPU_V6 || CPU_V6K) && !CPU_V7 - depends on !(MACH_REALVIEW_PB1176 || REALVIEW_EB_ARM11MP || \ - MACH_REALVIEW_PB11MP) default y if CPU_V6 || CPU_V6K || CPU_V7 help Historically, the kernel has used strongly ordered mappings to |