From 012bb3e61e5eced6c610f9e036372bf0c8def2d1 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 5 Oct 2000 01:18:40 +0000 Subject: Merge with Linux 2.4.0-test9. Please check DECstation, I had a number of rejects to fixup while integrating Linus patches. I also found that this kernel will only boot SMP on Origin; the UP kernel freeze soon after bootup with SCSI timeout messages. I commit this anyway since I found that the last CVS versions had the same problem. --- drivers/scsi/advansys.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/scsi/advansys.c') diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 02315dc57..bf89438ee 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -6785,10 +6785,8 @@ advansys_setup(char *str, int *ints) * --- Loadable Driver Support */ -#ifdef MODULE -Scsi_Host_Template driver_template = ADVANSYS; +static Scsi_Host_Template driver_template = ADVANSYS; # include "scsi_module.c" -#endif /* MODULE */ /* -- cgit v1.2.3