diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-28 23:59:33 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-28 23:59:33 +0100 |
| commit | 764e2c70eff2251e818537ac59f2365d0e4cf524 (patch) | |
| tree | 301d61cb559ce4d2baade87bfdc9c6e62c510338 /arch/arm/mm/dma-mapping.c | |
| parent | Merge tag 'sunxi-fixes-for-3.19' of https://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is d... (diff) | |
| download | linux-764e2c70eff2251e818537ac59f2365d0e4cf524.tar.xz linux-764e2c70eff2251e818537ac59f2365d0e4cf524.zip | |
Merge tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/linux-mvebu into fixes
Merge "mvebu-fixes-6" from Andrew Lunn:
The previous fix for Armada XP, disabling I/O coherency, broke Armada
375/38x. Only switch the PL310 to I/O coherent mode if I/O coherency
is enabled.
* tag 'mvebu-fixes-3.19-6' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions