diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2005-11-08 12:50:26 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-11-08 12:50:26 -0500 |
| commit | 383f9749505cef0a30dbd7109db7fe469aa64753 (patch) | |
| tree | 9e88d648396ac99a90d12ccf5471d001e87c65ae /include/scsi/scsi_request.h | |
| parent | f093182d313edde9b1f86dbdaf40ba4da2dbd0e7 (diff) | |
| parent | 3da8b713da723e78a03f0404beedf3cc6f4f860b (diff) | |
Merge by hand (conflicts between pending drivers and kfree cleanups)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi/scsi_request.h')
| -rw-r--r-- | include/scsi/scsi_request.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/scsi/scsi_request.h b/include/scsi/scsi_request.h index 2539debb7993..98d69fdb851c 100644 --- a/include/scsi/scsi_request.h +++ b/include/scsi/scsi_request.h | |||
| @@ -47,9 +47,6 @@ struct scsi_request { | |||
| 47 | 47 | ||
| 48 | extern struct scsi_request *scsi_allocate_request(struct scsi_device *, gfp_t); | 48 | extern struct scsi_request *scsi_allocate_request(struct scsi_device *, gfp_t); |
| 49 | extern void scsi_release_request(struct scsi_request *); | 49 | extern void scsi_release_request(struct scsi_request *); |
| 50 | extern void scsi_wait_req(struct scsi_request *, const void *cmnd, | ||
| 51 | void *buffer, unsigned bufflen, | ||
| 52 | int timeout, int retries); | ||
| 53 | extern void scsi_do_req(struct scsi_request *, const void *cmnd, | 50 | extern void scsi_do_req(struct scsi_request *, const void *cmnd, |
| 54 | void *buffer, unsigned bufflen, | 51 | void *buffer, unsigned bufflen, |
| 55 | void (*done) (struct scsi_cmnd *), | 52 | void (*done) (struct scsi_cmnd *), |