diff --git a/[refs] b/[refs]
index 27344c0fb2c4..41e660cc9e4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53cce97c3922fe4c08d2474e4f7b1968e79d7219
+refs/heads/master: 7460f1407ed8d46042b81a4227f19bc03e4d1072
diff --git a/trunk/arch/arm/plat-omap/include/plat/iommu.h b/trunk/arch/arm/plat-omap/include/plat/iommu.h
index 88be3e628b33..e58d57131476 100644
--- a/trunk/arch/arm/plat-omap/include/plat/iommu.h
+++ b/trunk/arch/arm/plat-omap/include/plat/iommu.h
@@ -126,6 +126,7 @@ struct omap_iommu_arch_data {
 	struct omap_iommu *iommu_dev;
 };
 
+#ifdef CONFIG_IOMMU_API
 /**
  * dev_to_omap_iommu() - retrieves an omap iommu object from a user device
  * @dev: iommu client device
@@ -136,6 +137,7 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev)
 
 	return arch_data->iommu_dev;
 }
+#endif
 
 /* IOMMU errors */
 #define OMAP_IOMMU_ERR_TLB_MISS		(1 << 0)