diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /drivers/scsi/hosts.c | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index abc86e123..ca7750d0c 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -107,12 +107,12 @@ #include "atari_scsi.h" #endif -#ifdef CONFIG_MAC_SCSI_OLD +#if defined(CONFIG_MAC_SCSI) || defined(CONFIG_MAC_SCSI_OLD) #include "mac_scsi.h" #endif -#ifdef CONFIG_MAC_SCSI -#include "mac_scsinew.h" +#ifdef CONFIG_SUN3_SCSI +#include "sun3_scsi.h" #endif #ifdef CONFIG_SCSI_MAC_ESP @@ -453,6 +453,10 @@ static Scsi_Host_Template builtin_scsi_hosts[] = #endif #endif +#ifdef CONFIG_SUN3_SCSI + SUN3_NCR5380, +#endif + #ifdef CONFIG_MVME16x_SCSI MVME16x_SCSI, #endif @@ -716,6 +720,8 @@ struct Scsi_Host * scsi_register(Scsi_Host_Template * tpnt, int j){ retval->loaded_as_module = scsi_loadable_module_flag; retval->host_no = max_scsi_hosts++; /* never reuse host_no (DB) */ next_scsi_host++; + /* FIXME: what with overflows? Old code suffered from the same, BTW */ + sprintf(retval->proc_name, "%d", retval->host_no); retval->host_queue = NULL; init_waitqueue_head(&retval->host_wait); retval->resetting = 0; |