diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
|---|---|---|
| committer | <ralf@linux-mips.org> | 1997-04-29 21:13:14 +0000 |
| commit | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (patch) | |
| tree | 40b1cb534496a7f1ca0f5c314a523c69f1fee464 /drivers/scsi/hosts.c | |
| parent | 7206675c40394c78a90e74812bbdbf8cf3cca1be (diff) | |
Import of Linux/MIPS 2.1.36
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 759022208..41e5dab80 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -30,6 +30,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/proc_fs.h> +#include <linux/init.h> #include "scsi.h" @@ -145,6 +146,10 @@ #include "wd7000.h" #endif +#ifdef CONFIG_SCSI_IBMMCA +#include "ibmmca.h" +#endif + #ifdef CONFIG_SCSI_EATA #include "eata.h" #endif @@ -169,13 +174,21 @@ #include "sgiwd93.h" #endif +#ifdef CONFIG_SCSI_QLOGICPTI +#include "qlogicpti.h" +#endif + +#ifdef CONFIG_BLK_DEV_IDESCSI +#include "ide-scsi.h" +#endif + #ifdef CONFIG_SCSI_DEBUG #include "scsi_debug.h" #endif /* -static const char RCSid[] = "$Header: /export/home0/cvs/linux/drivers/scsi/hosts.c,v 1.5 1996/08/12 11:11:54 dm Exp $"; +static const char RCSid[] = "$Header: /vger/u4/cvs/linux/drivers/scsi/hosts.c,v 1.20 1996/12/12 19:18:32 davem Exp $"; */ /* @@ -295,6 +308,9 @@ static Scsi_Host_Template builtin_scsi_hosts[] = #ifdef CONFIG_SCSI_7000FASST WD7000, #endif +#ifdef CONFIG_SCSI_IBMMCA + IBMMCA, +#endif #ifdef CONFIG_SCSI_EATA EATA, #endif @@ -307,6 +323,12 @@ static Scsi_Host_Template builtin_scsi_hosts[] = #ifdef CONFIG_SCSI_SUNESP SCSI_SPARC_ESP, #endif +#ifdef CONFIG_SCSI_QLOGICPTI + QLOGICPTI, +#endif +#ifdef CONFIG_BLK_DEV_IDESCSI + IDESCSI, +#endif #ifdef CONFIG_SCSI_SGIWD93 SGIWD93_SCSI, #endif @@ -419,7 +441,7 @@ scsi_register_device(struct Scsi_Device_Template * sdpnt) return 0; } -unsigned int scsi_init() +__initfunc(unsigned int scsi_init(void)) { static int called = 0; int i, pcount; |