From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 12 Jan 2015 20:48:53 +0000 (+0000)
Subject: arm64: Combine coherent and non-coherent swiotlb dma_ops
X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~117^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d3bfbb4df58a8025b46b2676da2cf450385b754;p=pandora-kernel.git

arm64: Combine coherent and non-coherent swiotlb dma_ops

Since dev_archdata now has a dma_coherent state, combine the two
coherent and non-coherent operations and remove their declaration,
together with set_dma_ops, from the arch dma-mapping.h file.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

Reading git-diff-tree failed