X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fosst.h;fp=drivers%2Fscsi%2Fosst.h;h=b72e1c76f52cf874b4df78580dfdda496f6b0261;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=1e426f5d0ed8a734357c58897ff7619609b7a046;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h
index 1e426f5d0..b72e1c76f 100644
--- a/drivers/scsi/osst.h
+++ b/drivers/scsi/osst.h
@@ -3,6 +3,7 @@
  */
 
 #include <asm/byteorder.h>
+#include <linux/config.h>
 #include <linux/completion.h>
 
 /*	FIXME - rename and use the following two types or delete them!
@@ -517,8 +518,7 @@ struct osst_buffer {
   int writing;
   int midlevel_result;
   int syscall_result;
-  struct osst_request *last_SRpnt;
-  struct st_cmdstatus cmdstat;
+  struct scsi_request *last_SRpnt;
   unsigned char *b_data;
   os_aux_t *aux;               /* onstream AUX structure at end of each block     */
   unsigned short use_sg;       /* zero or number of s/g segments for this adapter */
@@ -626,15 +626,6 @@ struct osst_tape {
   struct gendisk *drive;
 } ;
 
-/* scsi tape command */
-struct osst_request {
-	unsigned char cmd[MAX_COMMAND_SIZE];
-	unsigned char sense[SCSI_SENSE_BUFFERSIZE];
-	int result;
-	struct osst_tape *stp;
-	struct completion *waiting;
-};
-
 /* Values of write_type */
 #define OS_WRITE_DATA      0
 #define OS_WRITE_EOD       1