diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
| commit | a4e0d9af403d099e751797f6cc69e4a8e2d78ef1 (patch) | |
| tree | 6f4afdffe5dbaad7529be987b8c3259a07395031 /arch/x86/kernel/early-quirks.c | |
| parent | c60f2b5c1defb6b1345968e1c65c2008c221d57d (diff) | |
| parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/x86/kernel/early-quirks.c')
| -rw-r--r-- | arch/x86/kernel/early-quirks.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index a0e11c0cc872..4353cf5e6fac 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c | |||
| @@ -16,10 +16,7 @@ | |||
| 16 | #include <asm/dma.h> | 16 | #include <asm/dma.h> |
| 17 | #include <asm/io_apic.h> | 17 | #include <asm/io_apic.h> |
| 18 | #include <asm/apic.h> | 18 | #include <asm/apic.h> |
| 19 | 19 | #include <asm/iommu.h> | |
| 20 | #ifdef CONFIG_GART_IOMMU | ||
| 21 | #include <asm/gart.h> | ||
| 22 | #endif | ||
| 23 | 20 | ||
| 24 | static void __init fix_hypertransport_config(int num, int slot, int func) | 21 | static void __init fix_hypertransport_config(int num, int slot, int func) |
| 25 | { | 22 | { |