aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/amd_iommu.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-23 16:30:27 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-23 16:30:27 +0100
commit3e5621edb3392b28efb260ac99b2d26fb8b44e73 (patch)
tree6d26f08661344d6f17271b287a4a89b9b85a9222 /arch/x86/kernel/amd_iommu.c
parentMerge branch 'x86/tsc' into x86/core (diff)
parentx86: remove dead BIO_VMERGE_BOUNDARY definition (diff)
downloadlinux-dev-3e5621edb3392b28efb260ac99b2d26fb8b44e73.tar.xz
linux-dev-3e5621edb3392b28efb260ac99b2d26fb8b44e73.zip
Merge branch 'x86/iommu' into x86/core
Diffstat (limited to 'arch/x86/kernel/amd_iommu.c')
-rw-r--r--arch/x86/kernel/amd_iommu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 0a60d60ed036..2e2da717b350 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -24,6 +24,7 @@
#include <linux/iommu-helper.h>
#include <asm/proto.h>
#include <asm/iommu.h>
+#include <asm/gart.h>
#include <asm/amd_iommu_types.h>
#include <asm/amd_iommu.h>