[patch] 2.4.17 drivers/scsi/NCR5380.c

Keith Owens (kaos@ocs.com.au)
Fri, 28 Dec 2001 15:19:27 +1100


Several drivers #include "NCR5380.c". If two or more of those drivers
are built into vmlinux then you get duplicate global symbols.
Functions in NCR5380.c must be static. There are a couple of other
suspect functions but they are conditioned by #ifdef so I left them
alone.

Index: 17.9/drivers/scsi/NCR5380.c
--- 17.9/drivers/scsi/NCR5380.c Sat, 08 Dec 2001 10:12:02 +1100 kaos (linux-2.4/U/b/0_NCR5380.c 1.4 644)
+++ 17.9(w)/drivers/scsi/NCR5380.c Fri, 28 Dec 2001 15:15:16 +1100 kaos (linux-2.4/U/b/0_NCR5380.c 1.4 644)
@@ -612,7 +612,7 @@ static int NCR5380_set_timer(struct Scsi
* Locks: disables irqs, takes and frees io_request_lock
*/

-void NCR5380_timer_fn(unsigned long unused)
+static void NCR5380_timer_fn(unsigned long unused)
{
struct Scsi_Host *instance;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/