---

yaml --- r: 271583 b: refs/heads/master c: 2cc21c4 h: refs/heads/master i: 271581: 637b876 271579: 7db3410 271575: 111f4e4 271567: 70c8b36 271551: fa68e7a v: v3
git-mirror · Oct 21, 2011 · 30817fd · 30817fd
1 parent 0547a44
commit 30817fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)