Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[~andy/linux] / drivers / scsi / aha1542.h

diff --git a/drivers/scsi/aha1542.h b/drivers/scsi/aha1542.h
index c402351dc79a8ec7b6ccac9e8c645df15b8fdf1f..b871d2b57f93235652d55761cc66617f2a52c291 100644 (file)
--- a/drivers/scsi/aha1542.h
+++ b/drivers/scsi/aha1542.h
@@ -131,9 +131,8 @@ struct ccb {                        /* Command Control Block 5.3 */
                                /* REQUEST SENSE */
 };
 
-static int aha1542_detect(Scsi_Host_Template *);
-static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-static int aha1542_abort(Scsi_Cmnd * SCpnt);
+static int aha1542_detect(struct scsi_host_template *);
+static int aha1542_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
 static int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
 static int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
 static int aha1542_host_reset(Scsi_Cmnd * SCpnt);