diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-12-15 20:17:02 -0600 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-12-15 20:17:02 -0600 |
commit | 7b16318dea8d9840dac567a2ae8c50ecdea36aea (patch) | |
tree | 8866511a03ba28dcfd98263aa0a8c65ef876c31b /include/scsi/scsi_cmnd.h | |
parent | 2a1e1379bae53f647c463a677cc2ec71b591c348 (diff) | |
download | linux-stable-7b16318dea8d9840dac567a2ae8c50ecdea36aea.tar.gz linux-stable-7b16318dea8d9840dac567a2ae8c50ecdea36aea.tar.bz2 linux-stable-7b16318dea8d9840dac567a2ae8c50ecdea36aea.zip |
Fix up SCSI mismerge
I forgot to do a git-update-cache on the merged files ...
Diffstat (limited to 'include/scsi/scsi_cmnd.h')
-rw-r--r-- | include/scsi/scsi_cmnd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 20da282d4abb..41cfc29be899 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -151,6 +151,6 @@ extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t); extern void scsi_put_command(struct scsi_cmnd *); extern void scsi_io_completion(struct scsi_cmnd *, unsigned int, unsigned int); extern void scsi_finish_command(struct scsi_cmnd *cmd); -extern void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd, int retries); +extern void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd); #endif /* _SCSI_SCSI_CMND_H */ |