diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
| commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
| tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /Documentation/IO-mapping.txt | |
| parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
| parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) | |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 | ||