patch-2.1.122 linux/drivers/scsi/hosts.c

• Lines: 56
• Date: Mon Sep 14 11:11:44 1998
• Orig file: v2.1.121/linux/drivers/scsi/hosts.c
• Orig date: Thu Aug 27 19:56:29 1998

diff -u --recursive --new-file v2.1.121/linux/drivers/scsi/hosts.c linux/drivers/scsi/hosts.c
@@ -197,10 +197,6 @@
 #include "AM53C974.h"
 #endif
 
-#ifdef CONFIG_SCSI_PPA
-#include "ppa.h"
-#endif
-
 #ifdef CONFIG_SCSI_SUNESP
 #include "esp.h"
 #endif
@@ -274,6 +270,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 $";
 */
 
@@ -441,9 +451,6 @@
 #ifdef CONFIG_SCSI_AM53C974
     AM53C974,
 #endif
-#ifdef CONFIG_SCSI_PPA
-    PPA,
-#endif
 #ifdef CONFIG_SCSI_SUNESP
     SCSI_SPARC_ESP,
 #endif
@@ -484,6 +491,13 @@
 #ifdef CONFIG_SCSI_POWERTECSCSI
     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_DEBUG
     SCSI_DEBUG,