diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-02-26 22:59:14 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-02-26 22:59:14 +0000 |
| commit | 02b6545fba28e6e7591bd9e0e3c8e02180664bb8 (patch) | |
| tree | 3aa11b9e3d14ed578c4ce522449ab88c14d38950 /sys/arch/mac68k/dev | |
| parent | 20e6bb83a19294d40b04d8aba9d4bf3c7bae232b (diff) | |
Fix symbol clash that would prevent a kernel configured with both ncr5380
drivers to link.
Diffstat (limited to 'sys/arch/mac68k/dev')
| -rw-r--r-- | sys/arch/mac68k/dev/ncr5380.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c index 6e7539089c6..22777cdb5d7 100644 --- a/sys/arch/mac68k/dev/ncr5380.c +++ b/sys/arch/mac68k/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr5380.c,v 1.19 2002/06/14 21:34:58 todd Exp $ */ +/* $OpenBSD: ncr5380.c,v 1.20 2003/02/26 22:59:13 miod Exp $ */ /* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */ /* @@ -74,11 +74,11 @@ static volatile int main_running = 0; static u_char busy; static void ncr5380_minphys(struct buf *bp); -static int ncr5380_scsi_cmd(struct scsi_xfer *xs); +static int mac68k_ncr5380_scsi_cmd(struct scsi_xfer *xs); static void ncr5380_show_scsi_cmd(struct scsi_xfer *xs); struct scsi_adapter ncr5380_switch = { - ncr5380_scsi_cmd, /* scsi_cmd() */ + mac68k_ncr5380_scsi_cmd, /* scsi_cmd() */ ncr5380_minphys, /* scsi_minphys() */ 0, /* open_target_lu() */ 0 /* close_target_lu() */ @@ -286,7 +286,7 @@ void *auxp; * Carry out a request from the high level driver. */ static int -ncr5380_scsi_cmd(struct scsi_xfer *xs) +mac68k_ncr5380_scsi_cmd(struct scsi_xfer *xs) { int sps; SC_REQ *reqp, *link, *tmp; |