aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2010-10-21 14:54:19 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-10-21 14:54:19 +0200
commit4d1529043705737ba442f5a0048043718e601ce4 (patch)
tree141eeb40ebeecf448c49f50c972822c650e6a9eb
parentMerge branch 'v2.6.36-rc8' into for-2.6.37/barrier (diff)
downloadlinux-dev-4d1529043705737ba442f5a0048043718e601ce4.tar.xz
linux-dev-4d1529043705737ba442f5a0048043718e601ce4.zip
Added blk-lib.c and blk-barrier.c was renamed to blk-flush.c
Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--Documentation/DocBook/kernel-api.tmpl3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 6899f471fb15..6b4e07f28b69 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -257,7 +257,8 @@ X!Earch/x86/kernel/mca_32.c
!Iblock/blk-sysfs.c
!Eblock/blk-settings.c
!Eblock/blk-exec.c
-!Eblock/blk-barrier.c
+!Eblock/blk-flush.c
+!Eblock/blk-lib.c
!Eblock/blk-tag.c
!Iblock/blk-tag.c
!Eblock/blk-integrity.c