X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Fscsi%2Fscsi_device.h;h=01a4c58f8badb8b7b5c1bb527fe8f4e8215b2b69;hb=e81cfd214f97a26ca2b00564258ebcf099214cbb;hp=a37a8148a31033970c3d5cd52905f324a140c41a;hpb=b31a0fecd1dd01f1db406014a7c8a73983e04cc9;p=linux-2.6-omap-h63xx.git

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index a37a8148a31..01a4c58f8ba 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -159,8 +159,6 @@ struct scsi_device {
 	atomic_t iodone_cnt;
 	atomic_t ioerr_cnt;
 
-	int timeout;
-
 	struct device		sdev_gendev,
 				sdev_dev;
 
@@ -367,10 +365,11 @@ extern int scsi_is_target_device(const struct device *);
 extern int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
 			int data_direction, void *buffer, unsigned bufflen,
 			unsigned char *sense, int timeout, int retries,
-			int flag);
+			int flag, int *resid);
 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);
+			    struct scsi_sense_hdr *, int timeout, int retries,
+			    int *resid);
 extern int scsi_execute_async(struct scsi_device *sdev,
 			      const unsigned char *cmd, int cmd_len, int data_direction,
 			      void *buffer, unsigned bufflen, int use_sg,