diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/scsi/hosts.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/scsi/hosts.c')
| -rw-r--r-- | drivers/scsi/hosts.c | 44 |
1 files changed, 35 insertions, 9 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 4fafcd60a..a818d5961 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -41,7 +41,15 @@ #include "hosts.h" -#if defined(CONFIG_A4000T_SCSI) || defined(CONFIG_WARPENGINE_SCSI) || defined(CONFIG_A4091_SCSI) || defined (CONFIG_GVP_TURBO_SCSI) +#if defined(CONFIG_A4000T_SCSI) || \ + defined(CONFIG_WARPENGINE_SCSI) || \ + defined(CONFIG_A4091_SCSI) || \ + defined (CONFIG_GVP_TURBO_SCSI) || \ + defined (CONFIG_BLZ603E) +#define AMIGA7XXCONFIG +#endif + +#ifdef AMIGA7XXCONFIG #include "amiga7xx.h" #endif @@ -125,6 +133,10 @@ #include "u14-34f.h" #endif +#ifdef CONFIG_SCSI_FD_MCS +#include "fd_mcs.h" +#endif + #ifdef CONFIG_SCSI_FUTURE_DOMAIN #include "fdomain.h" #endif @@ -197,10 +209,6 @@ #include "AM53C974.h" #endif -#ifdef CONFIG_SCSI_PPA -#include "ppa.h" -#endif - #ifdef CONFIG_SCSI_SUNESP #include "sparc_esp.h" #endif @@ -282,6 +290,20 @@ #endif /* + * Moved ppa driver to the end of the probe list + * since it is a removable host adapter. + * This means the parallel ZIP drive will not bump + * the order of the /dev/sd devices - campbell@torque.net + */ +#ifdef CONFIG_SCSI_PPA +#include "ppa.h" +#endif + +#ifdef CONFIG_SCSI_IMM +#include "imm.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 $"; */ @@ -315,7 +337,7 @@ Scsi_Host_Template * scsi_hosts = NULL; static Scsi_Host_Template builtin_scsi_hosts[] = { #ifdef CONFIG_AMIGA -#if defined(CONFIG_WARPENGINE_SCSI) || defined(CONFIG_A4000T_SCSI) || defined(CONFIG_A4091_SCSI) || defined (CONFIG_GVP_TURBO_SCSI) +#ifdef AMIGA7XXCONFIG AMIGA7XX_SCSI, #endif #ifdef CONFIG_A3000_SCSI @@ -449,9 +471,6 @@ static Scsi_Host_Template builtin_scsi_hosts[] = #ifdef CONFIG_SCSI_AM53C974 AM53C974, #endif -#ifdef CONFIG_SCSI_PPA - PPA, -#endif #ifdef CONFIG_SCSI_SUNESP SCSI_SPARC_ESP, #endif @@ -493,6 +512,13 @@ static Scsi_Host_Template builtin_scsi_hosts[] = POWERTECSCSI, #endif #endif +/* "Removable host adapters" below this line (Parallel Port/USB/other) */ +#ifdef CONFIG_SCSI_PPA + PPA, +#endif +#ifdef CONFIG_SCSI_IMM + IMM, +#endif #ifdef CONFIG_SCSI_SGIWD93 SGIWD93_SCSI, #endif |