From 239e9b05478d94078808c96d37c06df60d8a488a 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: 271584 b: refs/heads/master c:
 4236d97df69970680a017cf9255041c827c42b45 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 51cffd255f23..585db97083e8 100644
--- 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
index c621c98c99da..2d53c3df12dc 100644
--- 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);