Fix back wrong patches.

31 files changed, 54 insertions, 54 deletions

diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index e3d5e912d5d..2ca695b27fc 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.8 1996/03/19 21:10:09 mickey Exp $	*/
+/*	$OpenBSD: com.c,v 1.9 1996/03/20 01:00:42 mickey Exp $	*/
 /*	$NetBSD: com.c,v 1.65 1996/02/10 20:23:18 christos Exp $	*/
 
 /*-
@@ -367,7 +367,7 @@ comattach(parent, self, aux)
 
 	if (ia->ia_irq != IRQUNK)
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY,
-		    comintr, sc);
+		    comintr, sc, sc->sc_dev.dv_xname);
 
 #ifdef KGDB
 	if (kgdb_dev == makedev(commajor, unit)) {
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 1d0c045d798..4a0bb77f998 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha.c,v 1.12 1996/03/19 21:10:02 mickey Exp $	*/
+/*	$OpenBSD: aha.c,v 1.13 1996/03/20 01:00:35 mickey Exp $	*/
 /*	$NetBSD: aha1542.c,v 1.55 1995/12/24 02:31:06 mycroft Exp $	*/
 
 /*
@@ -604,7 +604,7 @@ ahaattach(parent, self, aux)
 	isa_establish(&aha->sc_id, &aha->sc_dev);
 #endif
 	aha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, ahaintr,
-	    aha);
+	    aha, aha->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/aha1542.c b/sys/dev/isa/aha1542.c
index 1f590eb0acf..a1c559ad646 100644
--- a/sys/dev/isa/aha1542.c
+++ b/sys/dev/isa/aha1542.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha1542.c,v 1.12 1996/03/19 21:10:02 mickey Exp $	*/
+/*	$OpenBSD: aha1542.c,v 1.13 1996/03/20 01:00:35 mickey Exp $	*/
 /*	$NetBSD: aha1542.c,v 1.55 1995/12/24 02:31:06 mycroft Exp $	*/
 
 /*
@@ -604,7 +604,7 @@ ahaattach(parent, self, aux)
 	isa_establish(&aha->sc_id, &aha->sc_dev);
 #endif
 	aha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, ahaintr,
-	    aha);
+	    aha, aha->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/aha284x.c b/sys/dev/isa/aha284x.c
index 91824287421..749f87840e0 100644
--- a/sys/dev/isa/aha284x.c
+++ b/sys/dev/isa/aha284x.c
@@ -180,7 +180,7 @@ ahe_attach(parent, self, aux)
         isa_establish(&ahc->sc_id, &ahc->sc_dev);
 #endif
         ahc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO,
-					ahcintr, ahc);
+					ahcintr, ahc, ahc->sc_dev.dv_xname);
 
 	/*
 	 * attach the devices on the bus
diff --git a/sys/dev/isa/aic6360.c b/sys/dev/isa/aic6360.c
index e26f34f36e9..c159feff414 100644
--- a/sys/dev/isa/aic6360.c
+++ b/sys/dev/isa/aic6360.c
@@ -767,7 +767,7 @@ aicattach(parent, self, aux)
 	isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, aicintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 
 	config_found(self, &sc->sc_link, aicprint);
 }
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index 646b51790e5..faeafbd2a56 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ast.c,v 1.5 1996/03/19 21:10:06 mickey Exp $	*/
+/*	$OpenBSD: ast.c,v 1.6 1996/03/20 01:00:39 mickey Exp $	*/
 /*	$NetBSD: ast.c,v 1.18 1995/06/26 04:08:04 cgd Exp $	*/
 
 /*
@@ -141,7 +141,7 @@ astattach(parent, self, aux)
 	}
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, astintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index 9fba3185250..b7ec8d9a110 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: boca.c,v 1.5 1996/03/19 21:10:07 mickey Exp $ */
+/*    $OpenBSD: boca.c,v 1.6 1996/03/20 01:00:40 mickey Exp $ */
 /*    $NetBSD: boca.c,v 1.6 1995/12/24 02:31:11 mycroft Exp $ */
 
 /*
@@ -136,7 +136,7 @@ bocaattach(parent, self, aux)
 	}
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, bocaintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c
index b1828e65407..7eebc3bec1d 100644
--- a/sys/dev/isa/bt.c
+++ b/sys/dev/isa/bt.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: bt.c,v 1.5 1996/03/19 21:10:08 mickey Exp $      */
+/*    $OpenBSD: bt.c,v 1.6 1996/03/20 01:00:41 mickey Exp $      */
 /*    $NetBSD: bt742a.c,v 1.50 1995/12/24 02:31:13 mycroft Exp $      */
 
 /*
@@ -614,7 +614,7 @@ btattach(parent, self, aux)
 	isa_establish(&bt->sc_id, &bt->sc_dev);
 #endif
 	bt->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, btintr,
-	    bt);
+	    bt, bt->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/bt742a.c b/sys/dev/isa/bt742a.c
index 88d0d415a27..8364a0bc5eb 100644
--- a/sys/dev/isa/bt742a.c
+++ b/sys/dev/isa/bt742a.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: bt742a.c,v 1.5 1996/03/19 21:10:08 mickey Exp $      */
+/*    $OpenBSD: bt742a.c,v 1.6 1996/03/20 01:00:41 mickey Exp $      */
 /*    $NetBSD: bt742a.c,v 1.50 1995/12/24 02:31:13 mycroft Exp $      */
 
 /*
@@ -614,7 +614,7 @@ btattach(parent, self, aux)
 	isa_establish(&bt->sc_id, &bt->sc_dev);
 #endif
 	bt->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, btintr,
-	    bt);
+	    bt, bt->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c
index e3d5e912d5d..2ca695b27fc 100644
--- a/sys/dev/isa/com.c
+++ b/sys/dev/isa/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.8 1996/03/19 21:10:09 mickey Exp $	*/
+/*	$OpenBSD: com.c,v 1.9 1996/03/20 01:00:42 mickey Exp $	*/
 /*	$NetBSD: com.c,v 1.65 1996/02/10 20:23:18 christos Exp $	*/
 
 /*-
@@ -367,7 +367,7 @@ comattach(parent, self, aux)
 
 	if (ia->ia_irq != IRQUNK)
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY,
-		    comintr, sc);
+		    comintr, sc, sc->sc_dev.dv_xname);
 
 #ifdef KGDB
 	if (kgdb_dev == makedev(commajor, unit)) {
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index f1843f2bef2..fbd573b59d7 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus.c,v 1.6 1996/03/19 21:10:11 mickey Exp $	*/
+/*	$OpenBSD: gus.c,v 1.7 1996/03/20 01:00:44 mickey Exp $	*/
 /*	$NetBSD: gus.c,v 1.7 1996/02/16 08:18:37 mycroft Exp $	*/
 
 /*-
@@ -922,7 +922,7 @@ gusattach(parent, self, aux)
 	 * we use IPL_CLOCK.
 	 */
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, gusintr,
-	    sc /* sc->sc_gusdsp */);
+	    sc /* sc->sc_gusdsp */, sc->sc_dev.dv_xname);
 
 	/*
 	 * Set some default values
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index ed710f3c626..0b37f563d17 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ed.c,v 1.7 1996/03/19 21:10:14 mickey Exp $	*/
+/*	$OpenBSD: if_ed.c,v 1.8 1996/03/20 01:00:46 mickey Exp $	*/
 /*	$NetBSD: if_ed.c,v 1.87 1996/01/10 16:49:25 chuck Exp $	*/
 
 /*
@@ -1265,7 +1265,7 @@ edattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, edintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 	sc->sc_sh = shutdownhook_establish((void (*)(void *))edstop, sc);
 }
 
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 50ee31aafa5..3ecd3de9390 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -413,7 +413,7 @@ egattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, egintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 void
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 155568bab91..b7f889b7c22 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_el.c,v 1.5 1996/03/19 21:10:17 mickey Exp $       */
+/*    $OpenBSD: if_el.c,v 1.6 1996/03/20 01:00:48 mickey Exp $       */
 /*    $NetBSD: if_el.c,v 1.34 1995/12/24 02:31:25 mycroft Exp $       */
 
 /*
@@ -207,7 +207,7 @@ elattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, elintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 
 	dprintf(("elattach() finished.\n"));
 }
diff --git a/sys/dev/isa/if_ep.c b/sys/dev/isa/if_ep.c
index b1f0fb9a101..51803249116 100644
--- a/sys/dev/isa/if_ep.c
+++ b/sys/dev/isa/if_ep.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_ep.c,v 1.8 1996/03/19 21:10:18 mickey Exp $       */
+/*    $OpenBSD: if_ep.c,v 1.9 1996/03/20 01:00:49 mickey Exp $       */
 /*    $NetBSD: if_ep.c,v 1.86 1995/12/24 02:31:27 mycroft Exp $       */
 
 /*
@@ -581,7 +581,7 @@ epattach(parent, self, aux)
 	{
 		struct isa_attach_args *ia = aux;
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET,
-		    epintr, sc);
+		    epintr, sc, sc->sc_dev.dv_xname);
 	}
 }
 
diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c
index 2a853fe9d36..6201923066a 100644
--- a/sys/dev/isa/if_fe.c
+++ b/sys/dev/isa/if_fe.c
@@ -1125,7 +1125,7 @@ feattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, feintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 1c914aab50e..033d71b7bf3 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_ie.c,v 1.5 1996/03/19 21:10:21 mickey Exp $       */
+/*    $OpenBSD: if_ie.c,v 1.6 1996/03/20 01:00:52 mickey Exp $       */
 /*    $NetBSD: if_ie.c,v 1.45 1995/12/24 02:31:33 mycroft Exp $       */
 
 /*-
@@ -778,7 +778,7 @@ ieattach(parent, self, aux)
 #endif
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET, ieintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/dev/isa/if_le.c b/sys/dev/isa/if_le.c
index d97490ebf6a..61c47031e92 100644
--- a/sys/dev/isa/if_le.c
+++ b/sys/dev/isa/if_le.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_le.c,v 1.6 1996/03/19 21:10:22 mickey Exp $       */
+/*    $OpenBSD: if_le.c,v 1.7 1996/03/20 01:00:54 mickey Exp $       */
 /*    $NetBSD: if_le.c,v 1.38 1995/12/24 02:31:35 mycroft Exp $       */
 
 /*-
@@ -399,7 +399,7 @@ leattach(parent, self, aux)
 			isa_dmacascade(ia->ia_drq);
 
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NET,
-		    leintredge, sc);
+		    leintredge, sc, sc->sc_dev.dv_xname);
 	}
 #endif
 
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index 89471450c1c..94954943b09 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isavar.h,v 1.5 1996/03/19 21:10:23 mickey Exp $	*/
+/*	$OpenBSD: isavar.h,v 1.6 1996/03/20 01:00:55 mickey Exp $	*/
 /*	$NetBSD: isavar.h,v 1.17 1995/12/24 02:31:38 mycroft Exp $      */
 
 /*
@@ -105,7 +105,7 @@ struct isa_softc {
 /* ISA interrupt sharing types */
 void	isascan __P((struct device *parent, void *match));
 void	*isa_intr_establish __P((int intr, int type, int level,
-	    int (*ih_fun)(void *), void *ih_arg));
+	    int (*ih_fun)(void *), void *ih_arg, char *));
 void	isa_intr_disestablish __P((void *handler));
 char	*isa_intr_typename __P((int type));
 
diff --git a/sys/dev/isa/lpt.c b/sys/dev/isa/lpt.c
index b21e27709b9..a1e43172b55 100644
--- a/sys/dev/isa/lpt.c
+++ b/sys/dev/isa/lpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpt.c,v 1.6 1996/03/19 21:10:24 mickey Exp $ */
+/*	$OpenBSD: lpt.c,v 1.7 1996/03/20 01:00:55 mickey Exp $ */
 /*	$NetBSD: lpt.c,v 1.31 1995/12/24 02:31:40 mycroft Exp $ */
 
 /*
@@ -240,7 +240,7 @@ lptattach(parent, self, aux)
 
 	if (ia->ia_irq != IRQUNK)
 		sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_NONE,
-		    lptintr, sc);
+		    lptintr, sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index b2ff25e5921..8fce277ec1d 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcd.c,v 1.7 1996/03/19 21:10:25 mickey Exp $ */
+/*	$OpenBSD: mcd.c,v 1.8 1996/03/20 01:00:56 mickey Exp $ */
 /*	$NetBSD: mcd.c,v 1.45 1996/01/30 18:28:05 thorpej Exp $ */
 
 /*
@@ -229,7 +229,7 @@ mcdattach(parent, self, aux)
 	mcd_soft_reset(sc);
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, mcdintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 /*
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index 186f630fe91..d2d1bf307be 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pas.c,v 1.6 1996/03/19 21:10:27 mickey Exp $	*/
+/*	$OpenBSD: pas.c,v 1.7 1996/03/20 01:00:57 mickey Exp $	*/
 /*	$NetBSD: pas.c,v 1.12 1996/02/16 08:18:34 mycroft Exp $	*/
 
 /*
@@ -432,7 +432,7 @@ pasattach(parent, self, aux)
 	
 	sc->sc_iobase = iobase;
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO,
-				       sbdsp_intr, &sc->sc_sbdsp);
+				       sbdsp_intr, &sc->sc_sbdsp, sc->sc_dev.dv_xname);
 
 	printf(" ProAudio Spectrum %s [rev %d] ", pasnames[sc->model], sc->rev);
 	
diff --git a/sys/dev/isa/pcmcia_pcic.c b/sys/dev/isa/pcmcia_pcic.c
index 30e4d84707d..8e8f16f1594 100644
--- a/sys/dev/isa/pcmcia_pcic.c
+++ b/sys/dev/isa/pcmcia_pcic.c
@@ -249,7 +249,7 @@ pcicattach(parent, self, aux)
 	    timeout((void (*)(void *))pcic_intr, pcic, pcic->sc_polltimo);
 	} else {
 	    pcic->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE,
-					     IPL_NET, pcic_intr, pcic);
+					     IPL_NET, pcic_intr, pcic, pcic->sc_dev.dv_xname);
 	    pcic->sc_polltimo = 0;
 	}
 }
diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c
index ad9bf185aef..909db507342 100644
--- a/sys/dev/isa/pss.c
+++ b/sys/dev/isa/pss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pss.c,v 1.6 1996/03/19 21:10:29 mickey Exp $ */
+/*	$OpenBSD: pss.c,v 1.7 1996/03/20 01:00:59 mickey Exp $ */
 /*	$NetBSD: pss.c,v 1.11 1995/12/24 02:31:45 mycroft Exp $ */
 
 /*
@@ -1006,7 +1006,7 @@ pssattach(parent, self, aux)
 
     /* Setup interrupt handler for PSS */
     sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, pssintr,
-	sc);
+	sc, sc->sc_dev.dv_xname);
 
     vers = (inw(sc->sc_iobase+PSS_ID_VERS)&0xff) - 1;
     printf(": ESC614%c\n", (vers > 0)?'A'+vers:' ');
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index 6caf9bdb7b5..368008a8583 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtfps.c,v 1.5 1996/03/19 21:10:30 mickey Exp $       */
+/*	$OpenBSD: rtfps.c,v 1.6 1996/03/20 01:01:01 mickey Exp $       */
 /*	$NetBSD: rtfps.c,v 1.14 1995/12/24 02:31:48 mycroft Exp $       */
 
 /*
@@ -149,7 +149,7 @@ rtfpsattach(parent, self, aux)
 	}
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_TTY, rtfpsintr,
-				       sc);
+				       sc, sc->sc_dev.dv_xname);
 }
 
 int
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 0d742d2c604..bc909fb2a40 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sb.c,v 1.6 1996/03/19 21:10:31 mickey Exp $	*/
+/*	$OpenBSD: sb.c,v 1.7 1996/03/20 01:01:01 mickey Exp $	*/
 /*	$NetBSD: sb.c,v 1.30 1996/02/16 08:18:32 mycroft Exp $	*/
 
 /*
@@ -271,7 +271,7 @@ sbattach(parent, self, aux)
 	int err;
 	
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO,
-				       sbdsp_intr, sc);
+				       sbdsp_intr, sc, sc->sc_dev.dv_xname);
 
 	sbdsp_attach(sc);
 
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 4e2ef8990cc..ccb16aa9165 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -439,7 +439,7 @@ seaattach(parent, self, aux)
 	isa_establish(&sea->sc_id, &sea->sc_deV);
 #endif
 	sea->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, seaintr,
-	    sea);
+	    sea, sc->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/ultra14f.c b/sys/dev/isa/ultra14f.c
index e9f9f2f78aa..49fea372b1f 100644
--- a/sys/dev/isa/ultra14f.c
+++ b/sys/dev/isa/ultra14f.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ultra14f.c,v 1.10 1996/03/19 21:10:33 mickey Exp $	*/
+/*	$OpenBSD: ultra14f.c,v 1.11 1996/03/20 01:01:04 mickey Exp $	*/
 /*	$NetBSD: ultra14f.c,v 1.61 1996/02/09 17:38:09 mycroft Exp $	*/
 
 /*
@@ -609,7 +609,7 @@ uhaattach(parent, self, aux)
 	isa_establish(&uha->sc_id, &uha->sc_dev);
 #endif
 	uha->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO,
-	    uha->intr, uha);
+	    uha->intr, uha, sc->sc_dev.dv_xname);
 
 	/*
 	 * ask the adapter what subunits are present
diff --git a/sys/dev/isa/wd.c b/sys/dev/isa/wd.c
index 96023380ae0..916e1b12a40 100644
--- a/sys/dev/isa/wd.c
+++ b/sys/dev/isa/wd.c
@@ -249,7 +249,7 @@ wdcattach(parent, self, aux)
 	printf("\n");
 
 	wdc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, wdcintr,
-	    wdc);
+	    wdc, wdc->sc_dev.dv_xname);
 
 	for (wa.wa_drive = 0; wa.wa_drive < 2; wa.wa_drive++)
 		(void)config_found(self, (void *)&wa, wdprint);
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index 3ccdfebf42c..6080334ede5 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wss.c,v 1.6 1996/03/19 21:10:36 mickey Exp $	*/
+/*	$OpenBSD: wss.c,v 1.7 1996/03/20 01:01:06 mickey Exp $	*/
 /*	$NetBSD: wss.c,v 1.9 1996/02/16 08:18:36 mycroft Exp $	*/
 
 /*
@@ -251,7 +251,7 @@ wssattach(parent, self, aux)
     isa_establish(&sc->sc_id, &sc->sc_dev);
 #endif
     sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_AUDIO, ad1848_intr,
-				   &sc->sc_ad1848);
+				   &sc->sc_ad1848, sc->sc_dev.dv_xname);
 
     ad1848_attach(&sc->sc_ad1848);
     
diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
index b714c74d4f2..1891be63584 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -250,7 +250,7 @@ wtattach(parent, self, aux)
 	sc->dens = -1;			/* unknown density */
 
 	sc->sc_ih = isa_intr_establish(ia->ia_irq, IST_EDGE, IPL_BIO, wtintr,
-	    sc);
+	    sc, sc->sc_dev.dv_xname);
 }
 
 int