diff --git a/[refs] b/[refs]
index c06ab296945a..16b50da88fb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d04e0ba3432e3fa68bd779330e0f79a9d979bc5f
+refs/heads/master: c18d2388170132ce015475f1fdab272b62c1e2da
diff --git a/trunk/drivers/iommu/irq_remapping.c b/trunk/drivers/iommu/irq_remapping.c
index 151690db692c..faf85d6e33fe 100644
--- a/trunk/drivers/iommu/irq_remapping.c
+++ b/trunk/drivers/iommu/irq_remapping.c
@@ -51,6 +51,11 @@ early_param("intremap", setup_irqremap);
 void __init setup_irq_remapping_ops(void)
 {
 	remap_ops = &intel_irq_remap_ops;
+
+#ifdef CONFIG_AMD_IOMMU
+	if (amd_iommu_irq_ops.prepare() == 0)
+		remap_ops = &amd_iommu_irq_ops;
+#endif
 }
 
 int irq_remapping_supported(void)