diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 15:22:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 15:22:36 -0700 |
commit | ad90fb97515b732bc27a0109baa10af636c3c8cd (patch) | |
tree | 9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7 /Documentation/scsi | |
parent | 6a398a3ef404e661999cd4c58974cbceb52762e3 (diff) | |
parent | c546d5db75b452737e554bb9c33dedb46847c4fd (diff) | |
download | linux-ad90fb97515b732bc27a0109baa10af636c3c8cd.tar.gz linux-ad90fb97515b732bc27a0109baa10af636c3c8cd.tar.bz2 linux-ad90fb97515b732bc27a0109baa10af636c3c8cd.zip |
Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
Pull asm/scatterlist.h removal from Jens Axboe:
"We don't have any specific arch scatterlist anymore, since parisc
finally switched over. Kill the include"
* 'for-4.2/sg' of git://git.kernel.dk/linux-block:
remove scatterlist.h generation from arch Kbuild files
remove <asm/scatterlist.h>
Diffstat (limited to 'Documentation/scsi')
-rw-r--r-- | Documentation/scsi/scsi_mid_low_api.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt index 731bc4f4c5e6..255075157511 100644 --- a/Documentation/scsi/scsi_mid_low_api.txt +++ b/Documentation/scsi/scsi_mid_low_api.txt @@ -1269,7 +1269,7 @@ Members of interest: request_buffer - either contains data buffer or scatter gather list depending on the setting of use_sg. Scatter gather elements are defined by 'struct scatterlist' found - in include/asm/scatterlist.h . + in include/linux/scatterlist.h . done - function pointer that should be invoked by LLD when the SCSI command is completed (successfully or otherwise). Should only be called by an LLD if the LLD has accepted |