diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/scsi/hosts.c | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 81a94ad30..33aaaeabe 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -355,6 +355,10 @@ #include "../net/fc/iph5526_scsi.h" #endif +#ifdef CONFIG_BLK_DEV_3W_XXXX_RAID +#include "3w-xxxx.h" +#endif + /* * Moved ppa driver to the end of the probe list * since it is a removable host adapter. @@ -635,7 +639,10 @@ static Scsi_Host_Template builtin_scsi_hosts[] = #endif #ifdef CONFIG_SCSI_DECNCR SCSI_DEC_ESP, -#endif +#endif +#ifdef CONFIG_BLK_DEV_3W_XXXX_RAID + TWXXXX, +#endif /* "Removable host adapters" below this line (Parallel Port/USB/other) */ #ifdef CONFIG_SCSI_PPA PPA, @@ -886,7 +893,6 @@ unsigned int __init scsi_init(void) printk ("scsi : %d host%s.\n", next_scsi_host, (next_scsi_host == 1) ? "" : "s"); - /* Now attach the high level drivers */ #ifdef CONFIG_BLK_DEV_SD scsi_register_device(&sd_template); |