aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Collins <bcollins@debian.org>2005-11-15 03:09:21 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-15 11:59:20 -0500
commit1d193f4f112b9d8855ba1339fa784ee95f25b9c7 (patch)
tree089f01b69c080df59405cb65ff3a9782bfdcb15e
parent400bb2369df481abae5aa801e63e70008e15fba5 (diff)
[PATCH] Update location of ll_rw_blk.c in docs
Picked from the ubuntu-2.6 tree The change in location for ll_rw_blk.c from drivers/block/ to block/ caused failure to generate documentation. Signed-off-by: Ben Collins <bcollins@ubuntu.com> Cc: Jeff Garzik <jgarzik@pobox.com> Cc: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Documentation/DocBook/kernel-api.tmpl2
-rw-r--r--Documentation/block/biodoc.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 0519c9dc0065..096aed62c326 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -386,7 +386,7 @@ X!Edrivers/pnp/system.c
386 386
387 <chapter id="blkdev"> 387 <chapter id="blkdev">
388 <title>Block Devices</title> 388 <title>Block Devices</title>
389!Edrivers/block/ll_rw_blk.c 389!Eblock/ll_rw_blk.c
390 </chapter> 390 </chapter>
391 391
392 <chapter id="miscdev"> 392 <chapter id="miscdev">
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 2d65c2182161..0fe01c805480 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -1063,8 +1063,8 @@ Aside:
10634.4 I/O contexts 10634.4 I/O contexts
1064I/O contexts provide a dynamically allocated per process data area. They may 1064I/O contexts provide a dynamically allocated per process data area. They may
1065be used in I/O schedulers, and in the block layer (could be used for IO statis, 1065be used in I/O schedulers, and in the block layer (could be used for IO statis,
1066priorities for example). See *io_context in drivers/block/ll_rw_blk.c, and 1066priorities for example). See *io_context in block/ll_rw_blk.c, and as-iosched.c
1067as-iosched.c for an example of usage in an i/o scheduler. 1067for an example of usage in an i/o scheduler.
1068 1068
1069 1069
10705. Scalability related changes 10705. Scalability related changes