Merge branch 'x86/iommu' into x86/core

2008-12-23 16:30:27 +01:00 · 2008-12-23 16:30:27 +01:00 · 3e5621edb3
commit 3e5621edb3
parent be9a1d3c2e 181de82ee3
12 changed files with 42 additions and 48 deletions
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@ -28,6 +28,7 @@
 #include <asm/amd_iommu_types.h>
 #include <asm/amd_iommu.h>
 #include <asm/iommu.h>
+#include <asm/gart.h>

 /*
 * definitions for the ACPI scanning code