diff --git a/[refs] b/[refs]
index 585db97083e8..d38f07a8fbc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4236d97df69970680a017cf9255041c827c42b45
+refs/heads/master: a65bc64f91623b9f7ef1fc7afa27e857c7b6e4a2
diff --git a/trunk/drivers/iommu/omap-iommu.c b/trunk/drivers/iommu/omap-iommu.c
index bd5f6064c74a..16d5b76fb449 100644
--- a/trunk/drivers/iommu/omap-iommu.c
+++ b/trunk/drivers/iommu/omap-iommu.c
@@ -1250,7 +1250,7 @@ static int __init omap_iommu_init(void)
 		return -ENOMEM;
 	iopte_cachep = p;
 
-	register_iommu(&omap_iommu_ops);
+	bus_set_iommu(&platform_bus_type, &omap_iommu_ops);
 
 	return platform_driver_register(&omap_iommu_driver);
 }