diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /Documentation/IO-mapping.txt | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'Documentation/IO-mapping.txt')
| -rw-r--r-- | Documentation/IO-mapping.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/IO-mapping.txt b/Documentation/IO-mapping.txt index 86edb61bdee6..78a440695e11 100644 --- a/Documentation/IO-mapping.txt +++ b/Documentation/IO-mapping.txt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | [ NOTE: The virt_to_bus() and bus_to_virt() functions have been | 1 | [ NOTE: The virt_to_bus() and bus_to_virt() functions have been |
| 2 | superseded by the functionality provided by the PCI DMA | 2 | superseded by the functionality provided by the PCI DMA interface |
| 3 | interface (see Documentation/DMA-mapping.txt). They continue | 3 | (see Documentation/PCI/PCI-DMA-mapping.txt). They continue |
| 4 | to be documented below for historical purposes, but new code | 4 | to be documented below for historical purposes, but new code |
| 5 | must not use them. --davidm 00/12/12 ] | 5 | must not use them. --davidm 00/12/12 ] |
| 6 | 6 | ||