Merge branch 'locks' of git://linux-nfs.org/~bfields/linux

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

diff --git a/drivers/usb/image/microtek.h b/drivers/usb/image/microtek.h
index 926d4bdc6746cb48b7352fe1d338f9e111d426c0..d5d62a93905885900ed64ca6596da41f55ea5942 100644 (file)
--- a/drivers/usb/image/microtek.h
+++ b/drivers/usb/image/microtek.h
@@ -8,14 +8,14 @@
  *
  */
 
-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;