summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2010-03-25 13:18:04 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2010-03-25 13:18:04 +0000
commit4a5e49e37289163dd98d7aa1d9bb91b541c9863c (patch)
treee91841c1c85cd064ad319041114eec1041f6b991
parent07a0982ca6277541534cffe136bcf34aa10dd881 (diff)
fix fallout of previous; ok dlg@
-rw-r--r--sys/dev/ic/ncr5380sbc.c6
-rw-r--r--sys/dev/ic/ncr5380var.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index 78cdee445fc..dafbdedf0ff 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr5380sbc.c,v 1.24 2010/03/23 01:57:19 krw Exp $ */
+/* $OpenBSD: ncr5380sbc.c,v 1.25 2010/03/25 13:18:03 otto Exp $ */
/* $NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $ */
/*
@@ -593,13 +593,13 @@ out:
* WARNING: This can be called recursively!
* (see comment in ncr5380_done)
*/
-int
+void
ncr5380_scsi_cmd(xs)
struct scsi_xfer *xs;
{
struct ncr5380_softc *sc;
struct sci_req *sr;
- int s, , flags;
+ int s, i, flags;
sc = xs->sc_link->adapter_softc;
flags = xs->flags;
diff --git a/sys/dev/ic/ncr5380var.h b/sys/dev/ic/ncr5380var.h
index 46ac6c67767..9e6361dc285 100644
--- a/sys/dev/ic/ncr5380var.h
+++ b/sys/dev/ic/ncr5380var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr5380var.h,v 1.11 2006/12/13 21:12:58 miod Exp $ */
+/* $OpenBSD: ncr5380var.h,v 1.12 2010/03/25 13:18:03 otto Exp $ */
/* $NetBSD: ncr5380var.h,v 1.6 1996/05/10 18:04:06 gwr Exp $ */
/*
@@ -172,7 +172,7 @@ struct ncr5380_softc {
void ncr5380_init(struct ncr5380_softc *);
void ncr5380_reset_scsibus(struct ncr5380_softc *);
int ncr5380_intr(struct ncr5380_softc *);
-int ncr5380_scsi_cmd(struct scsi_xfer *);
+void ncr5380_scsi_cmd(struct scsi_xfer *);
int ncr5380_pio_in(struct ncr5380_softc *, int, int, u_char *);
int ncr5380_pio_out(struct ncr5380_softc *, int, int, u_char *);