diff --git a/[refs] b/[refs]
index 8db50c0625d5..35825df34779 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8953fe54e7bd0f8cf1a763204e0e3b9e32bcc223
+refs/heads/master: 2f7702af64d6ae7ae8b7f6d5dca1bf8bdaf0ac1f
diff --git a/trunk/drivers/iommu/omap-iommu-debug.c b/trunk/drivers/iommu/omap-iommu-debug.c
index f55fc5dfbadc..0cac372b0d43 100644
--- a/trunk/drivers/iommu/omap-iommu-debug.c
+++ b/trunk/drivers/iommu/omap-iommu-debug.c
@@ -22,7 +22,7 @@
 #include <plat/iommu.h>
 #include <plat/iovmm.h>
 
-#include <plat/iopgtable.h>
+#include "omap-iopgtable.h"
 
 #define MAXCOLUMN 100 /* for short messages */
 
diff --git a/trunk/drivers/iommu/omap-iommu.c b/trunk/drivers/iommu/omap-iommu.c
index d0b1234581be..f2bbfb0fd0e0 100644
--- a/trunk/drivers/iommu/omap-iommu.c
+++ b/trunk/drivers/iommu/omap-iommu.c
@@ -26,7 +26,7 @@
 
 #include <plat/iommu.h>
 
-#include <plat/iopgtable.h>
+#include "omap-iopgtable.h"
 
 #define for_each_iotlb_cr(obj, n, __i, cr)				\
 	for (__i = 0;							\
diff --git a/trunk/arch/arm/plat-omap/include/plat/iopgtable.h b/trunk/drivers/iommu/omap-iopgtable.h
similarity index 100%
rename from trunk/arch/arm/plat-omap/include/plat/iopgtable.h
rename to trunk/drivers/iommu/omap-iopgtable.h
diff --git a/trunk/drivers/iommu/omap-iovmm.c b/trunk/drivers/iommu/omap-iovmm.c
index 2e10c3e0a7ae..b332392397ce 100644
--- a/trunk/drivers/iommu/omap-iovmm.c
+++ b/trunk/drivers/iommu/omap-iovmm.c
@@ -24,7 +24,7 @@
 #include <plat/iommu.h>
 #include <plat/iovmm.h>
 
-#include <plat/iopgtable.h>
+#include "omap-iopgtable.h"
 
 static struct kmem_cache *iovm_area_cachep;