diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-06-09 22:34:17 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-06-09 22:34:17 +0000 |
| commit | 3b0af2ec26abf0799e0d5ca6bc1627fae76479b5 (patch) | |
| tree | 55ad4d236fdfe785eec7c5e300002ec8f229c73e /sys/dev | |
| parent | 644d1d35ef86954bdb6e8d15f2d16e8c7bfc2e84 (diff) | |
Pass in the device name to pcmcia_intr_establish() instead of ""
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pcmcia/if_an_pcmcia.c | 4 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_wi_pcmcia.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c index adf9c4c28b0..3cccf4f0152 100644 --- a/sys/dev/pcmcia/if_an_pcmcia.c +++ b/sys/dev/pcmcia/if_an_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_an_pcmcia.c,v 1.8 2002/06/09 03:14:18 todd Exp $ */ +/* $OpenBSD: if_an_pcmcia.c,v 1.9 2002/06/09 22:34:16 millert Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -132,7 +132,7 @@ an_pcmcia_attach(parent, self, aux) sc->an_bhandle = psc->sc_pcioh.ioh; sc->sc_ih = pcmcia_intr_establish(psc->sc_pf, IPL_NET, - an_intr, sc, ""); + an_intr, sc, sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) printf("no irq"); diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index 4d162509561..59e45623999 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pcmcia.c,v 1.31 2002/06/09 03:14:18 todd Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.32 2002/06/09 22:34:16 millert Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -364,7 +364,8 @@ wi_pcmcia_attach(parent, self, aux) CSR_WRITE_2(sc, WI_EVENT_ACK, 0xffff); /* Establish the interrupt. */ - sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, wi_intr, psc, ""); + sc->sc_ih = pcmcia_intr_establish(pa->pf, IPL_NET, wi_intr, psc, + sc->sc_dev.dv_xname); if (sc->sc_ih == NULL) { printf("%s: couldn't establish interrupt\n", sc->sc_dev.dv_xname); |