diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 20:37:07 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 20:37:07 (GMT) |
| commit | 5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231 (patch) | |
| tree | 29dd80a7b33426d0890aa07b5864224557c62af7 /arch/blackfin/include/asm/dma-mapping.h | |
| parent | 0bb943c7a2136716757a263f604d26309fd98042 (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
| download | linux-fsl-qoriq-5177dc3f2b3220b2dcfcf35eb9e6ec53ee818231.tar.xz | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'arch/blackfin/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/blackfin/include/asm/dma-mapping.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h index ede748d..d7d9148 100644 --- a/arch/blackfin/include/asm/dma-mapping.h +++ b/arch/blackfin/include/asm/dma-mapping.h @@ -15,7 +15,11 @@ void dma_free_coherent(struct device *dev, size_t size, void *vaddr, #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) -#define dma_mapping_error +static inline +int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) +{ + return 0; +} /* * Map a single buffer of the indicated size for DMA in streaming mode. |