diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-17 14:39:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-17 14:39:00 +0200 |
| commit | 86b9523ab1517f6edeb87295329c901930d3732d (patch) | |
| tree | 48707eef8c942c18bd32cc73e517db15986dee5d /Documentation | |
| parent | 2c14ddc135d93cb4b33ee4bd4a2b05e21a4a762c (diff) | |
| parent | fffcda1183e93df84ad73ba7eb7782a5c354e2b3 (diff) | |
Merge branch 'gart/rename' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/x86_64/boot-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index 092e596a130..c54b4f503e2 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt @@ -206,7 +206,7 @@ IOMMU (input/output memory management unit) (e.g. because you have < 3 GB memory). Kernel boot message: "PCI-DMA: Disabling IOMMU" - 2. <arch/x86_64/kernel/pci-gart.c>: AMD GART based hardware IOMMU. + 2. <arch/x86/kernel/amd_gart_64.c>: AMD GART based hardware IOMMU. Kernel boot message: "PCI-DMA: using GART IOMMU" 3. <arch/x86_64/kernel/pci-swiotlb.c> : Software IOMMU implementation. Used |