remove some NetBSD code.

4 files changed, 4 insertions, 50 deletions

diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index 4ff37cf6260..02dda31b151 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ec.c,v 1.9 2006/10/20 16:54:01 brad Exp $	*/
+/*	$OpenBSD: if_ec.c,v 1.10 2006/10/20 17:02:24 brad Exp $	*/
 /*	$NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $	*/
 
 /*-
@@ -69,20 +69,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
@@ -349,11 +341,7 @@ ec_attach(struct device *parent, struct device *self, void *aux)
 	    ELINK2_CR_XSEL | ELINK2_CR_EALO);
 
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
-#ifdef __NetBSD__
-		sc->sc_enaddr[i] = NIC_GET(nict, nich, i);
-#else
 		sc->sc_arpcom.ac_enaddr[i] = NIC_GET(nict, nich, i);
-#endif
 
 	/*
 	 * Unmap PROM - select NIC registers.  The proper setting of the
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index 25de93b76eb..3f41f4810da 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isa.c,v 1.11 2006/10/20 16:54:01 brad Exp $	*/
+/*	$OpenBSD: if_ne_isa.c,v 1.12 2006/10/20 17:02:24 brad Exp $	*/
 /*	$NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $	*/
 
 /*-
@@ -52,9 +52,6 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#ifdef __NetBSD__
-#include <net/if_ether.h>
-#endif
 #include <net/if_media.h>
 
 #ifdef INET
@@ -62,12 +59,8 @@
 #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
 #include <net/bpf.h>
diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c
index 40a6083cbf1..524575b6d57 100644
--- a/sys/dev/isa/if_ne_isapnp.c
+++ b/sys/dev/isa/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isapnp.c,v 1.10 2006/10/20 16:54:01 brad Exp $	*/
+/*	$OpenBSD: if_ne_isapnp.c,v 1.11 2006/10/20 17:02:24 brad Exp $	*/
 /*	$NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $	*/
 
 /*-
@@ -52,9 +52,6 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#ifdef __NetBSD__
-#include <net/if_ether.h>
-#endif
 #include <net/if_media.h>
 
 #ifdef INET
@@ -62,12 +59,8 @@
 #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
 #include <net/bpf.h>
@@ -88,10 +81,6 @@
 #include <dev/isa/isavar.h>
 
 #include <dev/isa/isapnpreg.h>
-#ifdef __NetBSD__
-#include <dev/isa/isapnpvar.h>
-#include <dev/isa/isapnpdevs.h>
-#endif
 
 static int ne_isapnp_match(struct device *, void *, void *);
 static void ne_isapnp_attach(struct device *, struct device *, void *);
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.