diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /drivers/scsi/hosts.c | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 9bf8c5ec3..513ebf8ad 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -190,13 +190,21 @@ #include "ide-scsi.h" #endif +#ifdef CONFIG_SCSI_MESH +#include "mesh.h" +#endif + +#ifdef CONFIG_SCSI_MAC53C94 +#include "mac53c94.h" +#endif + #ifdef CONFIG_SCSI_DEBUG #include "scsi_debug.h" #endif /* -static const char RCSid[] = "$Header: /vger/u4/cvs/linux/drivers/scsi/hosts.c,v 1.20 1996/12/12 19:18:32 davem Exp $"; +static const char RCSid[] = "$Header: /src/cvs/linux/drivers/scsi/hosts.c,v 1.1.1.1 1997/06/01 03:17:37 ralf Exp $"; */ /* @@ -343,6 +351,12 @@ static Scsi_Host_Template builtin_scsi_hosts[] = #ifdef CONFIG_BLK_DEV_IDESCSI IDESCSI, #endif +#ifdef CONFIG_SCSI_MESH + SCSI_MESH, +#endif +#ifdef CONFIG_SCSI_MAC53C94 + SCSI_MAC53C94, +#endif #ifdef CONFIG_SCSI_SGIWD93 SGIWD93_SCSI, #endif |