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/setup.c | |
| parent | be9a1d3c2e559b267983bcf8b003997b83befb49 (diff) | |
| parent | 181de82ee3ffda1175f89d50c991dae31b79280c (diff) | |
Merge branch 'x86/iommu' into x86/core
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index a31223828597..08e02e8453c9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
| @@ -93,6 +93,7 @@ | |||
| 93 | #include <asm/desc.h> | 93 | #include <asm/desc.h> |
| 94 | #include <asm/dma.h> | 94 | #include <asm/dma.h> |
| 95 | #include <asm/iommu.h> | 95 | #include <asm/iommu.h> |
| 96 | #include <asm/gart.h> | ||
| 96 | #include <asm/mmu_context.h> | 97 | #include <asm/mmu_context.h> |
| 97 | #include <asm/proto.h> | 98 | #include <asm/proto.h> |
| 98 | 99 | ||