From 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Apr 2001 04:55:58 +0000 Subject: Merge with Linux 2.4.3. Note that mingetty does no longer work with serial console, you have to switch to another getty like getty_ps. This commit also includes a fix for a setitimer bug which did prevent getty_ps from working on older kernels. --- drivers/scsi/aha1542.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'drivers/scsi/aha1542.h') diff --git a/drivers/scsi/aha1542.h b/drivers/scsi/aha1542.h index d29ac0c08..7863ce193 100644 --- a/drivers/scsi/aha1542.h +++ b/drivers/scsi/aha1542.h @@ -130,16 +130,16 @@ struct ccb { /* Command Control Block 5.3 */ /* REQUEST SENSE */ }; -int aha1542_detect(Scsi_Host_Template *); -int aha1542_command(Scsi_Cmnd *); -int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); -int aha1542_abort(Scsi_Cmnd * SCpnt); -int aha1542_bus_reset(Scsi_Cmnd * SCpnt); -int aha1542_dev_reset(Scsi_Cmnd * SCpnt); -int aha1542_host_reset(Scsi_Cmnd * SCpnt); -extern int aha1542_old_abort(Scsi_Cmnd * SCpnt); -int aha1542_old_reset(Scsi_Cmnd *, unsigned int); -int aha1542_biosparam(Disk *, kdev_t, int*); +static int aha1542_detect(Scsi_Host_Template *); +static int aha1542_command(Scsi_Cmnd *); +static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); +static int aha1542_abort(Scsi_Cmnd * SCpnt); +static int aha1542_bus_reset(Scsi_Cmnd * SCpnt); +static int aha1542_dev_reset(Scsi_Cmnd * SCpnt); +static int aha1542_host_reset(Scsi_Cmnd * SCpnt); +static int aha1542_old_abort(Scsi_Cmnd * SCpnt); +static int aha1542_old_reset(Scsi_Cmnd *, unsigned int); +static int aha1542_biosparam(Disk *, kdev_t, int*); #define AHA1542_MAILBOXES 8 #define AHA1542_SCATTER 16 -- cgit v1.2.3