diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:34 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 06:47:34 -0500 |
| commit | 0bd5c4f7c874cf48ff7904dcf8a59988c8fea0e8 (patch) | |
| tree | a89023849fa29d7b6cb987e10e3ea8a995409c86 /arch | |
| parent | 7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (diff) | |
| parent | ff2c8a4167eb143c5e2a03148fa996978938e8d7 (diff) | |
Merge branch 'iommu/fixes-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/amd_iommu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 008e522b9536..c5962fe3796f 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
| @@ -24,9 +24,7 @@ | |||
| 24 | #include <linux/scatterlist.h> | 24 | #include <linux/scatterlist.h> |
| 25 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
| 26 | #include <linux/iommu-helper.h> | 26 | #include <linux/iommu-helper.h> |
| 27 | #ifdef CONFIG_IOMMU_API | ||
| 28 | #include <linux/iommu.h> | 27 | #include <linux/iommu.h> |
| 29 | #endif | ||
| 30 | #include <asm/proto.h> | 28 | #include <asm/proto.h> |
| 31 | #include <asm/iommu.h> | 29 | #include <asm/iommu.h> |
| 32 | #include <asm/gart.h> | 30 | #include <asm/gart.h> |