summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 13:12:41 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 13:12:41 -0800
commite0ae23550ffd3bfe319fa66879779be1a9a4a155 (patch)
treec9b7cce2baa430b8625dc01928260c7a6754f29b /include/scsi
parentdd1c1853e2742f4938b271dbe0cee735e2ffa3d9 (diff)
parenta5b3c86e4bfb5689d68932105d3fdd1477c9c281 (diff)
downloadlinux-e0ae23550ffd3bfe319fa66879779be1a9a4a155.tar.gz
linux-e0ae23550ffd3bfe319fa66879779be1a9a4a155.tar.bz2
linux-e0ae23550ffd3bfe319fa66879779be1a9a4a155.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index e94ca4d36035..290e3b4d2aec 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -275,7 +275,7 @@ extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
int data_direction, void *buffer, unsigned bufflen,
struct scsi_sense_hdr *, int timeout, int retries);
extern int scsi_execute_async(struct scsi_device *sdev,
- const unsigned char *cmd, int data_direction,
+ const unsigned char *cmd, int cmd_len, int data_direction,
void *buffer, unsigned bufflen, int use_sg,
int timeout, int retries, void *privdata,
void (*done)(void *, char *, int, int),