From d3da270fbe3b8dd1307af8cb96d5b3f8ad3d3dca Mon Sep 17 00:00:00 2001
From: Ohad Ben-Cohen <ohad@wizery.com>
Date: Thu, 13 Oct 2011 12:53:18 +0100
Subject: [PATCH] --- yaml --- r: 264650 b: refs/heads/master c:
 cfb470b336f8bb69150697bde1316cf5fdad08fc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9045a628d9a5..9e26c12c6413 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01885bc5ce5a58e043e00f3f295301ef1b9a0fc4
+refs/heads/master: cfb470b336f8bb69150697bde1316cf5fdad08fc
diff --git a/trunk/arch/arm/include/asm/device.h b/trunk/arch/arm/include/asm/device.h
index 9f390ce335cb..6615f03f56a5 100644
--- a/trunk/arch/arm/include/asm/device.h
+++ b/trunk/arch/arm/include/asm/device.h
@@ -10,6 +10,9 @@ struct dev_archdata {
 #ifdef CONFIG_DMABOUNCE
 	struct dmabounce_device_info *dmabounce;
 #endif
+#ifdef CONFIG_IOMMU_API
+	void *iommu; /* private IOMMU data */
+#endif
 };
 
 struct pdev_archdata {