[src/trunk]: src/sys/dev/scsipi We only need a single attachment for uk at sc...

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b910d4db8846
branches:  trunk
changeset: 551541:b910d4db8846
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Mon Sep 08 01:26:41 2003 +0000

description:
We only need a single attachment for uk at scsibus and atapibus.

diffstat:

 sys/dev/scsipi/files.scsipi |   5 ++---
 sys/dev/scsipi/uk.c         |  11 ++++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diffs (49 lines):

diff -r cbb947258d65 -r b910d4db8846 sys/dev/scsipi/files.scsipi
--- a/sys/dev/scsipi/files.scsipi       Mon Sep 08 01:13:04 2003 +0000
+++ b/sys/dev/scsipi/files.scsipi       Mon Sep 08 01:26:41 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.scsipi,v 1.33 2002/10/09 20:23:56 thorpej Exp $
+#      $NetBSD: files.scsipi,v 1.34 2003/09/08 01:26:41 mycroft Exp $
 #
 # Config file and device description for machine-independent SCSI code.
 # Included by ports that need it.  Ports that use it must provide
@@ -71,6 +71,5 @@
 file   dev/scsipi/ss_scanjet.c         ss
 
 device uk
-attach uk at scsibus with uk_scsibus
-attach uk at atapibus with uk_atapibus
+attach uk at scsibus, atapibus
 file   dev/scsipi/uk.c                 uk                      needs-flag
diff -r cbb947258d65 -r b910d4db8846 sys/dev/scsipi/uk.c
--- a/sys/dev/scsipi/uk.c       Mon Sep 08 01:13:04 2003 +0000
+++ b/sys/dev/scsipi/uk.c       Mon Sep 08 01:26:41 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uk.c,v 1.40 2003/06/29 22:30:46 fvdl Exp $     */
+/*     $NetBSD: uk.c,v 1.41 2003/09/08 01:26:42 mycroft Exp $  */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.40 2003/06/29 22:30:46 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.41 2003/09/08 01:26:42 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -71,11 +71,8 @@
 int ukdetach __P((struct device *, int));
 
 
-CFATTACH_DECL(uk_scsibus, sizeof(struct uk_softc),
-    ukmatch, ukattach, ukdetach, ukactivate);
-
-CFATTACH_DECL(uk_atapibus, sizeof(struct uk_softc),
-    ukmatch, ukattach, ukdetach, ukactivate);
+CFATTACH_DECL(uk, sizeof(struct uk_softc), ukmatch, ukattach, ukdetach,
+    ukactivate);
 
 extern struct cfdriver uk_cd;