diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/scsi/eata.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
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.
Diffstat (limited to 'drivers/scsi/eata.c')
| -rw-r--r-- | drivers/scsi/eata.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c index 4f3c09d6c..0d0711878 100644 --- a/drivers/scsi/eata.c +++ b/drivers/scsi/eata.c @@ -2292,12 +2292,11 @@ int eata2x_release(struct Scsi_Host *shpnt) { return FALSE; } -#if defined(MODULE) -Scsi_Host_Template driver_template = EATA; +static Scsi_Host_Template driver_template = EATA; #include "scsi_module.c" -#else +#ifndef MODULE #if LINUX_VERSION_CODE < LinuxVersionCode(2,3,18) void eata2x_setup(char *str, int *ints) { |