summaryrefslogtreecommitdiff
path: root/sys/dev/isa/if_we.c
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-10-20 17:02:25 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-10-20 17:02:25 +0000
commit545aae114b48a08d38b0b01118c1fb180691c89d (patch)
tree165dd78174a0f272e28cb991b6b09f674fe4334d /sys/dev/isa/if_we.c
parentbc84703e9f93bdc102d3416a6939ea7e4a505b0e (diff)
remove some NetBSD code.
Diffstat (limited to 'sys/dev/isa/if_we.c')
-rw-r--r--sys/dev/isa/if_we.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c
index 37fbe057787..2b63bea3042 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.16 2006/10/20 16:54:01 brad Exp $ */
+/* $OpenBSD: if_we.c,v 1.17 2006/10/20 17:02:24 brad Exp $ */
/* $NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $ */
/*-
@@ -71,20 +71,12 @@
#include <net/if_types.h>
#include <net/if_media.h>
-#ifdef __NetBSD__
-#include <net/if_ether.h>
-#endif
-
#ifdef INET
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/in_var.h>
#include <netinet/ip.h>
-#ifdef __NetBSD__
-#include <netinet/if_inarp.h>
-#else
#include <netinet/if_ether.h>
-#endif
#endif
#if NBPFILTER > 0
@@ -137,13 +129,9 @@ struct cfattach we_isapnp_ca = {
};
#endif /* NWE_ISAPNP */
-#ifdef __NetBSD__
-extern struct cfdriver we_cd;
-#else
struct cfdriver we_cd = {
NULL, "we", DV_IFNET
};
-#endif
const char *we_params(bus_space_tag_t, bus_space_handle_t, u_int8_t *,
bus_size_t *, int *, int *);
@@ -431,12 +419,8 @@ we_attach(struct device *parent, struct device *self, void *aux)
/* Get station address from EEPROM. */
for (i = 0; i < ETHER_ADDR_LEN; i++)
-#ifdef __NetBSD__
- sc->sc_enaddr[i] = bus_space_read_1(asict, asich, WE_PROM + i);
-#else
sc->sc_arpcom.ac_enaddr[i] =
bus_space_read_1(asict, asich, WE_PROM + i);
-#endif
/*
* Set upper address bits and 8/16 bit access to shared memory.