[RESEND PATCH 2.6.15-rc1] Update location of ll_rw_blk.c in kernel-api.tmpl

[RESEND PATCH 2.6.15-rc1] Update location of ll_rw_blk.c in kernel-api.tmpl

[Ben Collins]

Picked from the ubuntu-2.6 tree

diff-tree d96fe6eeebd11fb8f70d091eb368e901cec64e1b (from cfd55027d8596fdd19e0023573cc0a6b92994d35)
Author: Ben Collins <bcollins@ubuntu.com>
Date:   Sat Nov 12 09:29:51 2005 -0500

    [UBUNTU:Documentation] Update location of ll_rw_blk.c in docs
    
    The change in location for ll_rw_blk.c from drivers/block/ to block/
    caused failure to generate documentation.
    
    UpstreamStatus: Submitted for 2.6.15
    
    Signed-off-by: Ben Collins <bcollins@ubuntu.com>

diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -388,7 +388,7 @@ X!Edrivers/pnp/system.c
 
   <chapter id="blkdev">
      <title>Block Devices</title>
-!Edrivers/block/ll_rw_blk.c
+!Eblock/ll_rw_blk.c
   </chapter>
 
   <chapter id="miscdev">
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -1063,8 +1063,8 @@ Aside:
 4.4 I/O contexts
 I/O contexts provide a dynamically allocated per process data area. They may
 be used in I/O schedulers, and in the block layer (could be used for IO statis,
-priorities for example). See *io_context in drivers/block/ll_rw_blk.c, and
-as-iosched.c for an example of usage in an i/o scheduler.
+priorities for example). See *io_context in block/ll_rw_blk.c, and as-iosched.c
+for an example of usage in an i/o scheduler.
 
 
 5. Scalability related changes

-- 
Ubuntu     - http://www.ubuntu.com/
Debian     - http://www.debian.org/
Linux 1394 - http://www.linux1394.org/
SwissDisk  - http://www.swissdisk.com/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [RESEND PATCH 2.6.15-rc1] Update location of ll_rw_blk.c in kernel-api.tmpl

[Jeff Garzik]

Ben Collins wrote:
> Picked from the ubuntu-2.6 tree
> 
> diff-tree d96fe6eeebd11fb8f70d091eb368e901cec64e1b (from cfd55027d8596fdd19e0023573cc0a6b92994d35)
> Author: Ben Collins <bcollins@ubuntu.com>
> Date:   Sat Nov 12 09:29:51 2005 -0500
> 
>     [UBUNTU:Documentation] Update location of ll_rw_blk.c in docs
>     
>     The change in location for ll_rw_blk.c from drivers/block/ to block/
>     caused failure to generate documentation.
>     
>     UpstreamStatus: Submitted for 2.6.15
>     
>     Signed-off-by: Ben Collins <bcollins@ubuntu.com>

ACK