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"
Unified · Split
| @@ -91,7 +91,6 @@ static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) · 90 unmodified lines | |||
| 91 | */ | 91 | */ |
| 92 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | 92 | static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) |
| 93 | { | 93 | { |
| 94 | debug_dma_mapping_error(dev, dma_addr); | ||
| 95 | return dma_addr == DMA_ERROR_CODE; | 94 | return dma_addr == DMA_ERROR_CODE; |
| 96 | } | 95 | } |
| 97 | 96 | ||