diff options
| author | Aaron Campbell <aaron@cvs.openbsd.org> | 1998-12-23 07:58:27 +0000 |
|---|---|---|
| committer | Aaron Campbell <aaron@cvs.openbsd.org> | 1998-12-23 07:58:27 +0000 |
| commit | a60fc8c4dfa2c054627aa079b95d4f6719f86627 (patch) | |
| tree | d3eb36afe12fd375d8604feacefb1a8f161e919d /sys | |
| parent | 6c43447da4577cfed3ac090ea2ee6777d6c03a5b (diff) | |
whoops; finally this should work with isapnp *and* non-isapnp
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/isa/if_we.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c index b670d963988..68265bd2170 100644 --- a/sys/dev/isa/if_we.c +++ b/sys/dev/isa/if_we.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_we.c,v 1.6 1998/12/23 06:02:19 aaron Exp $ */ +/* $OpenBSD: if_we.c,v 1.7 1998/12/23 07:58:26 aaron Exp $ */ /* $NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $ */ /*- @@ -377,7 +377,7 @@ we_attach(parent, self, aux) memt = ia->ia_memt; /* Map the device. */ - if (ia->ia_ioh) + if (!strcmp(parent->dv_cfdata->cf_driver->cd_name, "isapnp") && ia->ia_ioh) asich = ia->ia_ioh; else if (bus_space_map(asict, ia->ia_iobase, WE_NPORTS, 0, &asich)) { printf(": can't map nic i/o space\n"); @@ -401,7 +401,7 @@ we_attach(parent, self, aux) * Map memory space. Note we use the size that might have * been overridden by the user. */ - if (ia->ia_memh) + if (!strcmp(parent->dv_cfdata->cf_driver->cd_name, "isapnp") && ia->ia_memh) memh = ia->ia_memh; else if (bus_space_map(memt, ia->ia_maddr, ia->ia_msize, 0, &memh)) { printf(": can't map shared memory\n"); |