diff --git a/[refs] b/[refs]
index d93efc300c40..b94c56b292d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94d6c61b97cbcb3b538276c3785896ea12ecaecb
+refs/heads/master: 35b16a9a093757a7a1ef288eea1128b0b4a3eef7
diff --git a/trunk/arch/xtensa/include/asm/dma-mapping.h b/trunk/arch/xtensa/include/asm/dma-mapping.h
index 492c95790ad5..eb69743172b1 100644
--- a/trunk/arch/xtensa/include/asm/dma-mapping.h
+++ b/trunk/arch/xtensa/include/asm/dma-mapping.h
@@ -16,6 +16,8 @@
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
 
+#define DMA_ERROR_CODE		(~(dma_addr_t)0x0)
+
 /*
  * DMA-consistent mapping functions.
  */