summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier.adi@gmail.com>2008-11-18 10:48:22 +0100
committerBryan Wu <cooloney@kernel.org>2008-11-18 10:48:22 +0100
commit62273eeb6ac516ab0abf49417378726ad8875b03 (patch)
tree038957e2a8f409137fcd341304ace89cdc487573
parentBlackfin arch: fix bug - Turn on DEBUG_DOUBLEFAULT, booting SMP kernel crash (diff)
downloadlinux-62273eeb6ac516ab0abf49417378726ad8875b03.tar.xz
linux-62273eeb6ac516ab0abf49417378726ad8875b03.zip
Blackfin arch: fix a broken define in dma-mapping
dma_mapping_error is an actual function, so fix broken define with a real inline stub Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org>
-rw-r--r--arch/blackfin/include/asm/dma-mapping.h6
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 ede748d67efd..d7d9148e433c 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.