From 9108795f6d7df51581cdeb56fdd35ce4f8ddb3c6 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 6 Sep 2011 17:56:07 +0200
Subject: [PATCH] --- yaml --- r: 271586 b: refs/heads/master c:
 85eebbc5e4633e6eee10bdddd00d175daadd5841 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/iommu/msm_iommu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d38f07a8fbc3..1e615fab5e9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a65bc64f91623b9f7ef1fc7afa27e857c7b6e4a2
+refs/heads/master: 85eebbc5e4633e6eee10bdddd00d175daadd5841
diff --git a/trunk/drivers/iommu/msm_iommu.c b/trunk/drivers/iommu/msm_iommu.c
index d1733f672f16..5865dd2e28f9 100644
--- a/trunk/drivers/iommu/msm_iommu.c
+++ b/trunk/drivers/iommu/msm_iommu.c
@@ -728,7 +728,7 @@ static void __init setup_iommu_tex_classes(void)
 static int __init msm_iommu_init(void)
 {
 	setup_iommu_tex_classes();
-	register_iommu(&msm_iommu_ops);
+	bus_set_iommu(&platform_bus_type, &msm_iommu_ops);
 	return 0;
 }