[4692] in linux-scsi channel archive
[PATCH] simple fix for duplicate #define definitions in SCSI
daemon@ATHENA.MIT.EDU (Eric PAIRE)
Fri Sep 11 02:52:15 1998
From: Eric PAIRE <e.paire@opengroup.org>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Linux SCSI <linux-scsi@vger.rutgers.edu>,
Linux Kernel <linux-kernel@vger.rutgers.edu>,
Eric Paire <e.paire@opengroup.org>
Reply-To: Eric PAIRE <e.paire@opengroup.org>
Date: Fri, 11 Sep 1998 08:07:36 +0200
Here is a simple patch which fixes duplicate definition of MAX_SCSI_DEVICE_CODE
and bad location of SCSI_TIMEOUT #defines from drivers/scsi/scsi.c (should
all be in scsi.h since used in scsi.c and scsi_error.c).
Best regards,
-Eric
+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ Eric PAIRE
Email : e.paire@gr.opengroup.org | THE Open GROUP - Grenoble Research Institute
Phone : +33 (0) 476 63 48 71 | 2, avenue de Vignate
Fax : +33 (0) 476 51 05 32 | F-38610 Gieres FRANCE
------ Cut Here ------ Cut Here ------ Cut Here ------ Cut Here ------
--- drivers/scsi/scsi.h.OLD Thu Sep 10 08:33:19 1998
+++ drivers/scsi/scsi.h Thu Sep 10 09:29:35 1998
@@ -42,6 +42,12 @@
#define MAX_SCSI_DEVICE_CODE 10
extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
+#ifdef DEBUG
+ #define SCSI_TIMEOUT (5*HZ)
+#else
+ #define SCSI_TIMEOUT (2*HZ)
+#endif
+
/*
* Use these to separate status msg and our bytes
*
--- drivers/scsi/scsi.c.OLD Mon Aug 3 11:26:35 1998
+++ drivers/scsi/scsi.c Thu Sep 10 09:12:57 1998
@@ -90,14 +90,6 @@
# error You lose.
#endif
-#define MAX_SCSI_DEVICE_CODE 10
-
-#ifdef DEBUG
- #define SCSI_TIMEOUT (5*HZ)
-#else
- #define SCSI_TIMEOUT (2*HZ)
-#endif
-
#define MIN_RESET_DELAY (2*HZ)
/* Do not call reset on error if we just did a reset within 15 sec. */
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.rutgers.edu
