From 628848c36cc1a16f8e553ce124b48b42b5b39597 Mon Sep 17 00:00:00 2001
From: Hiroshi Doyu <hdoyu@nvidia.com>
Date: Thu, 24 Jan 2013 15:16:56 +0200
Subject: [PATCH] --- yaml --- r: 358817 b: refs/heads/master c:
 fab112a394b9cf5e3bf888af6ff5076ba9fa0f06 h: refs/heads/master i:   358815:
 afff27bb8a8039bdf853536d4fbe5790c52c47f7 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/include/asm/device.h | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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