diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index 1732d67d6582..271eb2629052 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr5380sbc.c,v 1.46 2001/11/15 09:48:07 lukem Exp $	*/
+/*	$NetBSD: ncr5380sbc.c,v 1.47 2001/11/26 20:15:49 fredette Exp $	*/
 
 /*
  * Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.46 2001/11/15 09:48:07 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.47 2001/11/26 20:15:49 fredette Exp $");
 
 #include "opt_ddb.h"
 
@@ -2279,7 +2279,6 @@ next_phase:
 	sc->sc_prevphase = phase;
 
 do_actions:
-	__asm("_ncr5380_actions:");
 
 	if (act_flags & ACT_WAIT_DMA) {
 		act_flags &= ~ACT_WAIT_DMA;
@@ -2384,7 +2383,6 @@ do_actions:
 		NCR5380_WRITE(sc, sci_sel_enb, 0x80);
 
 		if ((act_flags & ACT_CMD_DONE) == 0) {
-			__asm("_ncr5380_disconnected:");
 			NCR_TRACE("machine: discon, cur=0x%x\n", (long)sr);
 		}
 
diff --git a/sys/dev/ic/ncr5380var.h b/sys/dev/ic/ncr5380var.h
index ade33fd4a315..6c1a8fa6b14b 100644
--- a/sys/dev/ic/ncr5380var.h
+++ b/sys/dev/ic/ncr5380var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ncr5380var.h,v 1.21 2001/05/26 20:55:48 bjh21 Exp $	*/
+/*	$NetBSD: ncr5380var.h,v 1.22 2001/11/26 20:15:48 fredette Exp $	*/
 
 /*
  * Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -38,7 +38,7 @@
  */
 
 /*
- * Only arm26, i386, vax, mips and sparc use real bus space:
+ * Only arm26, i386, vax, mips, sparc, and sun2 use real bus space:
  *	arm32: csa driver; easy to convert
  *	mac68k: sbc driver; easy to convert
  *	pc532: ncr driver; need bus.h first
@@ -46,7 +46,7 @@
  *	sun3: si driver; need bus.h first
  */
 #if defined(__arm26__) || defined(__i386__) || defined(__vax__) || \
-	defined(__mips__) || defined(__sparc__)
+	defined(__mips__) || defined(__sparc__) || defined(sun2)
 # define NCR5380_USE_BUS_SPACE
 #endif