---

yaml --- r: 212242 b: refs/heads/master c: 4db77ff h: refs/heads/master v: v3
git-mirror · Aug 26, 2010 · 36e8085 · 36e8085
1 parent b99c759
commit 36e8085
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22e6daf41ba28ddc06295e42859b266f737b3e99
+refs/heads/master: 4db77ff3237a88ea74f691dd776e92b2f86a8f3f
diff --git a/trunk/drivers/pci/dmar.c b/trunk/drivers/pci/dmar.c
@@ -36,6 +36,7 @@
 #include <linux/tboot.h>
 #include <linux/dmi.h>
 #include <linux/slab.h>
+#include <asm/iommu_table.h>
 
 #define PREFIX "DMAR: "
 
@@ -724,7 +725,7 @@ int __init detect_intel_iommu(void)
 	early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
 	dmar_tbl = NULL;
 
-	return (ret ? 1 : -ENODEV);
+	return ret ? 1 : -ENODEV;
 }
 
 
@@ -1457,3 +1458,4 @@ int __init dmar_ir_support(void)
 		return 0;
 	return dmar->flags & 0x1;
 }
+IOMMU_INIT_POST(detect_intel_iommu);