diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:30:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:30:27 -0500 |
| commit | 3e5621edb3392b28efb260ac99b2d26fb8b44e73 (patch) | |
| tree | 6d26f08661344d6f17271b287a4a89b9b85a9222 /arch/x86/kernel/amd_iommu.c | |
| parent | be9a1d3c2e559b267983bcf8b003997b83befb49 (diff) | |
| parent | 181de82ee3ffda1175f89d50c991dae31b79280c (diff) | |
Merge branch 'x86/iommu' into x86/core
Diffstat (limited to 'arch/x86/kernel/amd_iommu.c')
| -rw-r--r-- | arch/x86/kernel/amd_iommu.c | 1 |
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 @@ | |||
| 24 | #include <linux/iommu-helper.h> | 24 | #include <linux/iommu-helper.h> |
| 25 | #include <asm/proto.h> | 25 | #include <asm/proto.h> |
| 26 | #include <asm/iommu.h> | 26 | #include <asm/iommu.h> |
| 27 | #include <asm/gart.h> | ||
| 27 | #include <asm/amd_iommu_types.h> | 28 | #include <asm/amd_iommu_types.h> |
| 28 | #include <asm/amd_iommu.h> | 29 | #include <asm/amd_iommu.h> |
| 29 | 30 | ||