summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-26 10:01:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-26 10:01:43 -0700
commitef48bfd6fe4ade12bae4e8e5b58edc4023d5f96b (patch)
tree4cd4732e1c6d306a24bb357d1b8a958ca57cc907
parent622f202a4cba7acbd843f22fa67c206c15d45034 (diff)
parent697575896670ba9e76760ce8bbc1f5a3001967d6 (diff)
downloadlinux-ef48bfd6fe4ade12bae4e8e5b58edc4023d5f96b.tar.bz2
Merge branch 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA-mapping revert from Marek Szyprowski: "Due to my mistake, my previous pull request (merged as commit cff7b8ba60e3: "Merge branch 'fixes_for_linus' ..") contained a patch which is aimed for v3.8 and lacks its dependences. This pull request reverts it and fixes build break of ARM architecture." * 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: Revert "ARM: dma-mapping: support debug_dma_mapping_error"
-rw-r--r--arch/arm/include/asm/dma-mapping.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 78d8e9b5544f..23004847bb05 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -91,7 +91,6 @@ static inline dma_addr_t virt_to_dma(struct device *dev, void *addr)
*/
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
- debug_dma_mapping_error(dev, dma_addr);
return dma_addr == DMA_ERROR_CODE;
}