diff --git a/[refs] b/[refs]
index ef27a9b90c3c..2653eb47a8e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 821c92f258bd9b01eb900992969803645b6ba9d6
+refs/heads/master: 02a1416478b70cd49bd74827438c8ba797784728
diff --git a/trunk/include/asm-um/dma-mapping.h b/trunk/include/asm-um/dma-mapping.h
index f0ee4fb55911..90fc708b320e 100644
--- a/trunk/include/asm-um/dma-mapping.h
+++ b/trunk/include/asm-um/dma-mapping.h
@@ -118,4 +118,11 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,
 	BUG();
 }
 
+static inline int
+dma_mapping_error(struct device *dev, dma_addr_t dma_handle)
+{
+	BUG();
+	return 0;
+}
+
 #endif