summaryrefslogtreecommitdiff
path: root/sys/arch/macppc
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2004-08-17 22:20:56 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2004-08-17 22:20:56 +0000
commit487d416829f8ffad29d2c1c118a8120c11500f27 (patch)
tree3257a56953c92514494eec1fd1cc48799c936454 /sys/arch/macppc
parent42aa46af962ba920af600796b5bbe851814a27aa (diff)
Use device name, not constant string, ok deraadt@
Diffstat (limited to 'sys/arch/macppc')
-rw-r--r--sys/arch/macppc/dev/if_wi_obio.c4
-rw-r--r--sys/arch/macppc/dev/wdc_obio.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/macppc/dev/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c
index 023475dd172..4fb980748f3 100644
--- a/sys/arch/macppc/dev/if_wi_obio.c
+++ b/sys/arch/macppc/dev/if_wi_obio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_obio.c,v 1.9 2003/10/26 15:34:16 drahn Exp $ */
+/* $OpenBSD: if_wi_obio.c,v 1.10 2004/08/17 22:20:55 drahn Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -121,7 +121,7 @@ wi_obio_attach(parent, self, aux)
/* Establish the interrupt. */
mac_intr_establish(parent, ca->ca_intr[0], IST_LEVEL, IPL_NET,
- wi_intr, psc, "wi_obio");
+ wi_intr, psc, sc->sc_dev.dv_xname);
/* Make sure interrupts are disabled. */
CSR_WRITE_2(sc, WI_INT_EN, 0);
diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index 719741beb0d..c69182aa089 100644
--- a/sys/arch/macppc/dev/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_obio.c,v 1.21 2004/03/17 18:57:07 drahn Exp $ */
+/* $OpenBSD: wdc_obio.c,v 1.22 2004/08/17 22:20:55 drahn Exp $ */
/* $NetBSD: wdc_obio.c,v 1.15 2001/07/25 20:26:33 bouyer Exp $ */
/*-
@@ -184,7 +184,7 @@ wdc_obio_attach(struct device *parent, struct device *self, void *aux)
chp->data32ioh = chp->cmd_ioh;
mac_intr_establish(parent, intr, IST_LEVEL, IPL_BIO, wdcintr, chp,
- "wdc_obio");
+ sc->sc_wdcdev.sc_dev.dv_xname);
sc->sc_wdcdev.set_modes = wdc_obio_adjust_timing;
if (use_dma) {