diff options
| author | Steven Whitehouse <steve@men-an-tol.chygwyn.com> | 2006-02-23 04:49:43 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-23 04:49:43 -0500 |
| commit | d35462b4bb847b68321c55e95c926aa485aecce2 (patch) | |
| tree | b08e18bf6e672633402871ee763102fdb5e63229 /include/scsi/scsi_device.h | |
| parent | 91ffd7db71e7451f89941a8f428b4daa2a7c1e38 (diff) | |
| parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/scsi/scsi_device.h')
| -rw-r--r-- | include/scsi/scsi_device.h | 2 |
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, | |||
| 275 | int data_direction, void *buffer, unsigned bufflen, | 275 | int data_direction, void *buffer, unsigned bufflen, |
| 276 | struct scsi_sense_hdr *, int timeout, int retries); | 276 | struct scsi_sense_hdr *, int timeout, int retries); |
| 277 | extern int scsi_execute_async(struct scsi_device *sdev, | 277 | extern int scsi_execute_async(struct scsi_device *sdev, |
| 278 | const unsigned char *cmd, int data_direction, | 278 | const unsigned char *cmd, int cmd_len, int data_direction, |
| 279 | void *buffer, unsigned bufflen, int use_sg, | 279 | void *buffer, unsigned bufflen, int use_sg, |
| 280 | int timeout, int retries, void *privdata, | 280 | int timeout, int retries, void *privdata, |
| 281 | void (*done)(void *, char *, int, int), | 281 | void (*done)(void *, char *, int, int), |