From 30817fdb2b3f86666b5a2ec2e7fcd19750a3d197 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: 271583 b: refs/heads/master c:
 2cc21c4236f0d1fb67a30d87cfb0f49f185690a0 h: refs/heads/master i:   271581:
 637b87637b1face7c57b3492a7850e80f0b1dd85   271579:
 7db34102e08116d24fa2a6e3c9b55bf79da8f014   271575:
 111f4e469f59c90539ca3b97eae757965435c983   271567:
 70c8b36a1c5b732252d9ab68120690d4abef1282   271551:
 fa68e7a77c3c27dba1f667039dd6b3be61c81049 v: v3

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

diff --git a/[refs] b/[refs]
index 43297c95da3a..51cffd255f23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5aa7f00776f2d73f410ede5c1f68246cdc83de1
+refs/heads/master: 2cc21c4236f0d1fb67a30d87cfb0f49f185690a0
diff --git a/trunk/drivers/iommu/amd_iommu.c b/trunk/drivers/iommu/amd_iommu.c
index a14f8dc23462..57f6f38ca4f6 100644
--- a/trunk/drivers/iommu/amd_iommu.c
+++ b/trunk/drivers/iommu/amd_iommu.c
@@ -2493,7 +2493,7 @@ static unsigned device_dma_ops_init(void)
 
 void __init amd_iommu_init_api(void)
 {
-	register_iommu(&amd_iommu_ops);
+	bus_set_iommu(&pci_bus_type, &amd_iommu_ops);
 }
 
 int __init amd_iommu_init_dma_ops(void)