diff -ur linux-2.1.21.orig/drivers/scsi/ibmmca.c linux/drivers/scsi/ibmmca.c
--- linux-2.1.21.orig/drivers/scsi/ibmmca.c Wed Dec 18 20:48:52 1996
+++ linux/drivers/scsi/ibmmca.c Wed Jan 15 14:06:38 1997
@@ -843,7 +843,7 @@
ibmmca_abort (Scsi_Cmnd * cmd)
{
/*do a reset instead, since abort does not work well for me at present */
- return ibmmca_reset (cmd);
+ return ibmmca_reset (cmd, 0);
#if 0
unsigned int ldn;
@@ -889,7 +889,7 @@
/*--------------------------------------------------------------------*/
int
-ibmmca_reset (Scsi_Cmnd * cmd)
+ibmmca_reset (Scsi_Cmnd * cmd, unsigned int reset_flags /*not used*/)
{
/*issue reset immediate command to subsystem, and wait for interrupt */
printk ("IBM MCA SCSI: resetting all devices.\n");
diff -ur linux-2.1.21.orig/drivers/scsi/ibmmca.h linux/drivers/scsi/ibmmca.h
--- linux-2.1.21.orig/drivers/scsi/ibmmca.h Fri Dec 13 01:54:19 1996
+++ linux/drivers/scsi/ibmmca.h Wed Jan 15 14:06:40 1997
@@ -11,7 +11,7 @@
int ibmmca_command (Scsi_Cmnd *);
int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
int ibmmca_abort (Scsi_Cmnd *);
-int ibmmca_reset (Scsi_Cmnd *);
+int ibmmca_reset (Scsi_Cmnd *, unsigned int);
int ibmmca_biosparam (Disk *, kdev_t, int *);
/*structure for /proc filesystem */
diff -ur linux-2.1.21.orig/drivers/scsi/AM53C974.c linux/drivers/scsi/AM53C974.c
--- linux-2.1.21.orig/drivers/scsi/AM53C974.c Tue Oct 1 17:34:00 1996
+++ linux/drivers/scsi/AM53C974.c Wed Jan 15 14:07:08 1997
@@ -2205,7 +2205,7 @@
*
* Returns : status (SCSI_ABORT_SUCCESS)
**************************************************************************/
-int AM53C974_reset(Scsi_Cmnd *cmd)
+int AM53C974_reset(Scsi_Cmnd *cmd, unsigned int reset_flags /*not used*/)
{
AM53C974_local_declare();
int i;
diff -ur linux-2.1.21.orig/drivers/scsi/AM53C974.h linux/drivers/scsi/AM53C974.h
--- linux-2.1.21.orig/drivers/scsi/AM53C974.h Tue Oct 1 17:29:13 1996
+++ linux/drivers/scsi/AM53C974.h Wed Jan 15 14:07:10 1997
@@ -299,7 +299,7 @@
int AM53C974_command(Scsi_Cmnd *SCpnt);
int AM53C974_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *));
int AM53C974_abort(Scsi_Cmnd *cmd);
-int AM53C974_reset (Scsi_Cmnd *cmd);
+int AM53C974_reset (Scsi_Cmnd *cmd, unsigned int);
#define AM53C974_local_declare() unsigned long io_port
#define AM53C974_setio(instance) io_port = instance->io_port
diff -ur linux-2.1.21.orig/drivers/scsi/53c7,8xx.c linux/drivers/scsi/53c7,8xx.c
--- linux-2.1.21.orig/drivers/scsi/53c7,8xx.c Mon Oct 7 15:55:47 1996
+++ linux/drivers/scsi/53c7,8xx.c Wed Jan 15 14:09:18 1997
@@ -678,6 +678,7 @@
* Returns : NULL on failure, pointer to host structure on success.
*/
+#if 0 /* defined but not used, ignore until somebody needs it */
static struct Scsi_Host *
find_host (int host) {
struct Scsi_Host *h;
@@ -691,6 +692,7 @@
}
return h;
}
+#endif
/*
* Function : request_synchronous (int host, int target)
@@ -706,6 +708,7 @@
* -1 on failure.
*/
+#if 0 /* defined but not used, ignore until somebody needs it */
static int
request_synchronous (int host, int target) {
struct Scsi_Host *h;
@@ -741,6 +744,7 @@
restore_flags(flags);
return 0;
}
+#endif
/*
* Function : request_disconnect (int host, int on_or_off)
@@ -754,6 +758,7 @@
* Returns : 0 on success, * -1 on failure.
*/
+#if 0 /* defined but not used, ignore until somebody needs it */
static int
request_disconnect (int host, int on_or_off) {
struct Scsi_Host *h;
@@ -767,6 +772,7 @@
hostdata->options &= ~OPTION_DISCONNECT;
return 0;
}
+#endif
/*
* Function : static void NCR53c7x0_driver_init (struct Scsi_Host *host)
@@ -5408,6 +5414,7 @@
* Returns : char * representation of state, "unknown" on error.
*/
+#if 0 /* defined but not used, ignore until somebody needs it */
static const char *
ncr_state (int state) {
switch (state) {
@@ -5419,6 +5426,7 @@
default: return "unknown";
}
}
+#endif
/*
* Function : int NCR53c7xx_abort (Scsi_Cmnd *cmd)