Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef48bfd6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  cff7b8ba: "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"
parents 622f202a 69757589

arch/arm/include/asm/dma-mapping.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -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)

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;

	return dma_addr == DMA_ERROR_CODE;

}

}