fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / usb / image / microtek.h

diff --git a/drivers/usb/image/microtek.h b/drivers/usb/image/microtek.h
index 206994d..d5d62a9 100644 (file)
--- a/drivers/usb/image/microtek.h
+++ b/drivers/usb/image/microtek.h
@@ -8,21 +8,21 @@
  *
  */
 
-typedef void (*mts_scsi_cmnd_callback)(Scsi_Cmnd *);
+typedef void (*mts_scsi_cmnd_callback)(struct scsi_cmnd *);
 
 
 struct mts_transfer_context
 {
        struct mts_desc* instance;
        mts_scsi_cmnd_callback final_callback;
-       Scsi_Cmnd *srb;
+       struct scsi_cmnd *srb;
        
        void* data;
        unsigned data_length;
        int data_pipe;
        int fragment;
 
-       u8 status; /* status returned from ep_response after command completion */
+       u8 *scsi_status; /* status returned from ep_response after command completion */
 };
 
 
@@ -31,6 +31,7 @@ struct mts_desc {
        struct mts_desc *prev;
 
        struct usb_device *usb_dev;
+       struct usb_interface *usb_intf;
 
        /* Endpoint addresses */
        u8 ep_out;