From 11bd453515f89e155618d456e4eef81689512ae5 Mon Sep 17 00:00:00 2001
From: soren <soren@NetBSD.org>
Date: Fri, 17 Mar 2000 11:45:49 +0000
Subject: [PATCH] scsiprint() is needed even without scsibus'es, so move it to
 scsi_base.c .

---
 sys/dev/scsipi/scsi_base.c | 20 +++++++++++++++++++-
 sys/dev/scsipi/scsiconf.c  | 20 +-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sys/dev/scsipi/scsi_base.c b/sys/dev/scsipi/scsi_base.c
index 6b1b8b0daaf5..10c489f35ee9 100644
--- a/sys/dev/scsipi/scsi_base.c
+++ b/sys/dev/scsipi/scsi_base.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsi_base.c,v 1.71 2000/01/17 17:59:48 bouyer Exp $	*/
+/*	$NetBSD: scsi_base.c,v 1.72 2000/03/17 11:45:50 soren Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -172,3 +172,21 @@ scsi_kill_pending(sc_link)
 		scsipi_done(xs);
 	}
 }
+
+int
+scsiprint(aux, pnp)
+	void *aux;
+	const char *pnp;
+{
+	struct scsipi_link *l = aux;
+
+	/* only "scsibus"es can attach to "scsi"s; easy. */
+	if (pnp)
+		printf("scsibus at %s", pnp);
+
+	/* don't print channel if the controller says there can be only one. */
+	if (l->scsipi_scsi.channel != SCSI_CHANNEL_ONLY_ONE)
+		printf(" channel %d", l->scsipi_scsi.channel);
+
+	return (UNCONF);
+}
diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c
index 3e236a276dd0..9dae90bebfba 100644
--- a/sys/dev/scsipi/scsiconf.c
+++ b/sys/dev/scsipi/scsiconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsiconf.c,v 1.135 2000/03/13 09:56:26 martin Exp $	*/
+/*	$NetBSD: scsiconf.c,v 1.136 2000/03/17 11:45:49 soren Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -118,24 +118,6 @@ void scsibus_config_interrupts __P((struct device *));
 
 cdev_decl(scsibus);
 
-int
-scsiprint(aux, pnp)
-	void *aux;
-	const char *pnp;
-{
-	struct scsipi_link *l = aux;
-
-	/* only "scsibus"es can attach to "scsi"s; easy. */
-	if (pnp)
-		printf("scsibus at %s", pnp);
-
-	/* don't print channel if the controller says there can be only one. */
-	if (l->scsipi_scsi.channel != SCSI_CHANNEL_ONLY_ONE)
-		printf(" channel %d", l->scsipi_scsi.channel);
-
-	return (UNCONF);
-}
-
 int
 scsibusmatch(parent, cf, aux)
 	struct device *parent;