linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / scsi / osst.h

diff --git a/drivers/scsi/osst.h b/drivers/scsi/osst.h
index 1e426f5..b72e1c7 100644 (file)
--- 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