X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fiommu%2Fintel-iommu.c;h=bb161d2fa03cbc7bbef23977cb5fc7c530329ef2;hb=1197ab2942f920f261952de0c392ac749a35796b;hp=be1953c239b0f557348da28b23d8bd2b2d72653f;hpb=d630ba565f3d806d64df4415d4a8457b4ab23db6;p=~andy%2Flinux

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index be1953c239b..bb161d2fa03 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3642,7 +3642,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);