diff --git a/[refs] b/[refs]
index 1ed5219b0ec2..e7e8b61a1331 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d09e1333ec6c8c6fe2875dc2763ebbac84efe8d7
+refs/heads/master: fab112a394b9cf5e3bf888af6ff5076ba9fa0f06
diff --git a/trunk/arch/arm/include/asm/device.h b/trunk/arch/arm/include/asm/device.h
index b69c0d3285f8..dc662fca9230 100644
--- a/trunk/arch/arm/include/asm/device.h
+++ b/trunk/arch/arm/include/asm/device.h
@@ -27,4 +27,10 @@ struct pdev_archdata {
 #endif
 };
 
+#ifdef CONFIG_ARM_DMA_USE_IOMMU
+#define to_dma_iommu_mapping(dev) ((dev)->archdata.mapping)
+#else
+#define to_dma_iommu_mapping(dev) NULL
+#endif
+
 #endif