patch up scsi mismerge

diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index 05afe0e71c34045d7cfe9cfbaa65fcd903a8b463..eaad877e0396f6e546a18422dcf6cd58fe618b74 100644 (file)
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -755,7 +755,8 @@ static int NCR53c406a_bus_reset(Scsi_Cmnd * SCpnt)
        return FAILED;
 }
 
-static int NCR53c406a_biosparm(Scsi_Disk * disk, struct block_device *dev,
+static int NCR53c406a_biosparm(struct scsi_disk *disk,
+                               struct block_device *dev,
                               sector_t capacity, int *info_array)
 {
        int size;

diff --git a/drivers/scsi/dtc.h b/drivers/scsi/dtc.h
index 3fe23ab04d4a67dc5456d9fe5c00708217d19bad..8be9ff43585d792a727cd3c6f1297239b63c5d1e 100644 (file)
--- a/drivers/scsi/dtc.h
+++ b/drivers/scsi/dtc.h
@@ -29,7 +29,7 @@
 #define DTC3280_H
 
 static int dtc_abort(Scsi_Cmnd *);
-static int dtc_biosparam(Disk *, struct block_device *,
+static int dtc_biosparam(struct scsi_device *, struct block_device *,
                         sector_t, int*);
 static int dtc_detect(Scsi_Host_Template *);
 static int dtc_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));

diff --git a/drivers/scsi/qlogicfas.h b/drivers/scsi/qlogicfas.h
index 39c74e28878be2af5dbd0a3cdea1011949c72d7f..74da123fb56d7e87b4e4e1f446a0e6d6b1b36885 100644 (file)
--- a/drivers/scsi/qlogicfas.h
+++ b/drivers/scsi/qlogicfas.h
@@ -9,10 +9,25 @@ static int qlogicfas_abort(Scsi_Cmnd *);
 static int qlogicfas_bus_reset(Scsi_Cmnd *);
 static int qlogicfas_device_reset(Scsi_Cmnd *);
 static int qlogicfas_host_reset(Scsi_Cmnd *);
-static int qlogicfas_biosparam(struct scsi_disk *, struct block_device *,
+static int qlogicfas_biosparam(struct scsi_device *, struct block_device *,
                               sector_t, int[]);
-}
 
+#define QLOGICFAS {                                            \
+       detect:                         qlogicfas_detect,       \
+       info:                           qlogicfas_info,         \
+       command:                        qlogicfas_command,      \
+       queuecommand:                   qlogicfas_queuecommand, \
+       eh_abort_handler:               qlogicfas_abort,        \
+       eh_bus_reset_handler:           qlogicfas_bus_reset,    \
+       eh_device_reset_handler:        qlogicfas_device_reset, \
+       eh_host_reset_handler:          qlogicfas_host_reset,   \
+       bios_param:     qlogicfas_biosparam,                    \
+       can_queue:      0,                                      \
+       this_id:        -1,                                     \
+       sg_tablesize:   SG_ALL,                                 \
+       cmd_per_lun:    1,                                      \
+       use_clustering: DISABLE_CLUSTERING                      \
+}
 #endif /* _QLOGICFAS_H */
 
 

diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index 258c6246715f2151f274b8c345ce46bd993c42f0..26de433f36e1cb3031c9afca37e8cf89dabf1af2 100644 (file)
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -298,7 +298,7 @@ int __init t128_detect(Scsi_Host_Template * tpnt){
  * and matching the H_C_S coordinates to what DOS uses.
  */
 
-int t128_biosparam(struct scsi_device *₍sdev, struct block_device *bdev,
+int t128_biosparam(struct scsi_device *sdev, struct block_device *bdev,
                sector_t capacity, int * ip)
 {
   ip[0] = 64;