summaryrefslogtreecommitdiff
path: root/Documentation/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2010-02-22 13:48:51 +0100
committerJens Axboe <jens.axboe@oracle.com>2010-02-22 13:48:51 +0100
commitf11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch)
tree6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /Documentation/block
parent429c42c9d246f5bda868495c09974312a0177328 (diff)
parentaea187c46f7d03ce985e55eb1398d0776a15b928 (diff)
downloadlinux-3.10-f11cbd74c5ff3614f6390b4de67a6ffdc614c378.tar.gz
linux-3.10-f11cbd74c5ff3614f6390b4de67a6ffdc614c378.tar.bz2
linux-3.10-f11cbd74c5ff3614f6390b4de67a6ffdc614c378.zip
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'Documentation/block')
-rw-r--r--Documentation/block/biodoc.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 8d2158a1c6a..6fab97ea7e6 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -186,7 +186,7 @@ a virtual address mapping (unlike the earlier scheme of virtual address
do not have a corresponding kernel virtual address space mapping) and
low-memory pages.
-Note: Please refer to Documentation/DMA-mapping.txt for a discussion
+Note: Please refer to Documentation/PCI/PCI-DMA-mapping.txt for a discussion
on PCI high mem DMA aspects and mapping of scatter gather lists, and support
for 64 bit PCI.