patch up scsi mismerge

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;

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 *));

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 */
 
 

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;