diff --git a/[refs] b/[refs]
index 0e5517412d69..f59b16a5db5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9b712765738d141154b435a5bfec4adbbee25f3
+refs/heads/master: 334280fff3f7201d0fd564fe85e0a6f035ce3f68
diff --git a/trunk/include/asm-blackfin/dma-mapping.h b/trunk/include/asm-blackfin/dma-mapping.h
index 7a77d7fe3a33..282fabccf6a6 100644
--- a/trunk/include/asm-blackfin/dma-mapping.h
+++ b/trunk/include/asm-blackfin/dma-mapping.h
@@ -15,6 +15,8 @@ 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
+
 /*
  * Map a single buffer of the indicated size for DMA in streaming mode.
  * The 32-bit bus address to use is returned.