commit 7b16318dea8d9840dac567a2ae8c50ecdea36aea
author James Bottomley <jejb@titanic.(none)> Thu Dec 15 20:17:02 2005 -0600
committer James Bottomley <jejb@titanic.(none)> Thu Dec 15 20:17:02 2005 -0600
tree 8866511a03ba28dcfd98263aa0a8c65ef876c31b
parent 2a1e1379bae53f647c463a677cc2ec71b591c348

Fix up SCSI mismerge

I forgot to do a git-update-cache on the merged files ...

include/scsi/scsi_cmnd.h

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 20da282..41cfc29 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -151,6 +151,6 @@
 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 */