---

yaml --- r: 271584 b: refs/heads/master c: 4236d97 h: refs/heads/master v: v3
git-mirror · Oct 21, 2011 · 239e9b0 · 239e9b0
1 parent 30817fd
commit 239e9b0
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: 2cc21c4236f0d1fb67a30d87cfb0f49f185690a0
+refs/heads/master: 4236d97df69970680a017cf9255041c827c42b45
diff --git a/trunk/drivers/iommu/intel-iommu.c b/trunk/drivers/iommu/intel-iommu.c
@@ -3486,7 +3486,7 @@ int __init intel_iommu_init(void)
 
 	init_iommu_pm_ops();
 
-	register_iommu(&intel_iommu_ops);
+	bus_set_iommu(&pci_bus_type, &intel_iommu_ops);
 
 	bus_register_notifier(&pci_bus_type, &device_nb);