diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-02 14:03:14 +1100 |
| commit | 97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03 (patch) | |
| tree | 8f7f591754baa934a842357e75e773a525bfb147 /arch/x86/kernel/pci-calgary_64.c | |
| parent | f6ab0b922c3423b88c0e6e3e2c5fc1e58d83055d (diff) | |
| parent | 54866f032307063776b4eff7eadb131d47f9f9b4 (diff) | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'arch/x86/kernel/pci-calgary_64.c')
| -rw-r--r-- | arch/x86/kernel/pci-calgary_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c index 1a20fe31338..6bf1f716909 100644 --- a/arch/x86/kernel/pci-calgary_64.c +++ b/arch/x86/kernel/pci-calgary_64.c @@ -36,7 +36,7 @@ #include <linux/pci.h> #include <linux/delay.h> #include <linux/scatterlist.h> -#include <asm/iommu.h> +#include <asm/gart.h> #include <asm/calgary.h> #include <asm/tce.h> #include <asm/pci-direct.h> |