diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 28fe8377996..3e4c43d143e 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -84,7 +84,7 @@ static void	ed_watchdog	(struct ifnet *);
 static void	ed_tick		(void *);
 #endif
 
-static void	ds_getmcaf	(struct ed_softc *, u_int32_t *);
+static void	ds_getmcaf	(struct ed_softc *, uint32_t *);
 
 static void	ed_get_packet	(struct ed_softc *, char *, /* u_short */ int);
 
@@ -3074,10 +3074,10 @@ ed_hpp_readmem(sc, src, dst, amount)
 			  ED_HPP_OPTION_BOOT_ROM_ENB));
 
 		if (use_32bit_access && (amount > 3)) {
-			u_int32_t *dl = (u_int32_t *) dst;	
-			volatile u_int32_t *const sl = 
-				(u_int32_t *) sc->hpp_mem_start;
-			u_int32_t *const fence = dl + (amount >> 2);
+			uint32_t *dl = (uint32_t *) dst;	
+			volatile uint32_t *const sl = 
+				(uint32_t *) sc->hpp_mem_start;
+			uint32_t *const fence = dl + (amount >> 2);
 			
 			/* Copy out NIC data.  We could probably write this
 			   as a `movsl'. The currently generated code is lousy.
@@ -3242,10 +3242,10 @@ ed_hpp_write_mbufs(struct ed_softc *sc, struct mbuf *m, int dst)
 				}
 				/* output contiguous words */
 				if ((len > 3) && (use_32bit_accesses)) {
-					volatile u_int32_t *const dl = 
-						(volatile u_int32_t *) d;
-					u_int32_t *sl = (u_int32_t *) data;
-					u_int32_t *fence = sl + (len >> 2);
+					volatile uint32_t *const dl = 
+						(volatile uint32_t *) d;
+					uint32_t *sl = (uint32_t *) data;
+					uint32_t *fence = sl + (len >> 2);
 
 					while (sl < fence)
 						*dl = *sl++;
@@ -3461,7 +3461,7 @@ ed_setrcr(sc)
 	} else {
 		/* set up multicast addresses and filter modes */
 		if (ifp->if_flags & IFF_MULTICAST) {
-			u_int32_t  mcaf[2];
+			uint32_t  mcaf[2];
 
 			if (ifp->if_flags & IFF_ALLMULTI) {
 				mcaf[0] = 0xffffffff;
@@ -3508,9 +3508,9 @@ ed_setrcr(sc)
 static void
 ds_getmcaf(sc, mcaf)
 	struct ed_softc *sc;
-	u_int32_t *mcaf;
+	uint32_t *mcaf;
 {
-	register u_int32_t index;
+	register uint32_t index;
 	register u_char *af = (u_char *) mcaf;
 	struct ifmultiaddr *ifma;
 
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 245faff0d4f..e8d12b84fab 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 
 static struct _pcsid
 {
-	u_int32_t	type;
+	uint32_t	type;
 	const char	*desc;
 } pci_ids[] =
 {
@@ -64,7 +64,7 @@ static int	ed_pci_attach(device_t);
 static int
 ed_pci_probe(device_t dev)
 {
-	u_int32_t	type = pci_get_devid(dev);
+	uint32_t	type = pci_get_devid(dev);
 	struct _pcsid	*ep =pci_ids;
 
 	while (ep->type && ep->type != type)
diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h
index d8da2fcc816..459907bf99c 100644
--- a/sys/dev/ed/if_edvar.h
+++ b/sys/dev/ed/if_edvar.h
@@ -76,7 +76,7 @@ struct ed_softc {
 
 	caddr_t mem_start;	/* NIC memory start address */
 	caddr_t mem_end;		/* NIC memory end address */
-	u_int32_t mem_size;	/* total NIC memory size */
+	uint32_t mem_size;	/* total NIC memory size */
 	caddr_t mem_ring;	/* start of RX ring-buffer (in NIC mem) */
 
 	u_char  mem_shared;	/* NIC memory is shared with host */
@@ -125,22 +125,22 @@ struct ed_softc {
 #define	ed_nic_insw(sc, port, addr, count) \
 	bus_space_read_multi_2(rman_get_bustag((sc)->port_res), \
 		rman_get_bushandle((sc)->port_res), \
-		(sc)->nic_offset + (port), (u_int16_t *)(addr), (count))
+		(sc)->nic_offset + (port), (uint16_t *)(addr), (count))
 
 #define	ed_nic_outsw(sc, port, addr, count) \
 	bus_space_write_multi_2(rman_get_bustag((sc)->port_res), \
 		rman_get_bushandle((sc)->port_res), \
-		(sc)->nic_offset + (port), (u_int16_t *)(addr), (count))
+		(sc)->nic_offset + (port), (uint16_t *)(addr), (count))
 
 #define	ed_nic_insl(sc, port, addr, count) \
 	bus_space_read_multi_4(rman_get_bustag((sc)->port_res), \
 		rman_get_bushandle((sc)->port_res), \
-		(sc)->nic_offset + (port), (u_int32_t *)(addr), (count))
+		(sc)->nic_offset + (port), (uint32_t *)(addr), (count))
 
 #define	ed_nic_outsl(sc, port, addr, count) \
 	bus_space_write_multi_4(rman_get_bustag((sc)->port_res), \
 		rman_get_bushandle((sc)->port_res), \
-		(sc)->nic_offset + (port), (u_int32_t *)(addr), (count))
+		(sc)->nic_offset + (port), (uint32_t *)(addr), (count))
 
 #define	ed_asic_inb(sc, port) \
 	bus_space_read_1(rman_get_bustag((sc)->port_res), \
@@ -173,22 +173,22 @@ struct ed_softc {
 #define	ed_asic_insw(sc, port, addr, count) \
 	bus_space_read_multi_2(rman_get_bustag((sc)->port_res), \
 		rman_get_bushandle((sc)->port_res), \
-		(sc)->asic_offset + (port), (u_int16_t *)(addr), (count))
+		(sc)->asic_offset + (port), (uint16_t *)(addr), (count))
 
 #define	ed_asic_outsw(sc, port, addr, count) \
 	bus_space_write_multi_2(rman_get_bustag((sc)->port_res), \
 		rman_get_bushandle((sc)->port_res), \
-		(sc)->asic_offset + (port), (u_int16_t *)(addr), (count))
+		(sc)->asic_offset + (port), (uint16_t *)(addr), (count))
 
 #define	ed_asic_insl(sc, port, addr, count) \
 	bus_space_read_multi_4(rman_get_bustag((sc)->port_res), \
 		rman_get_bushandle((sc)->port_res), \
-		(sc)->asic_offset + (port), (u_int32_t *)(addr), (count))
+		(sc)->asic_offset + (port), (uint32_t *)(addr), (count))
 
 #define	ed_asic_outsl(sc, port, addr, count) \
 	bus_space_write_multi_4(rman_get_bustag((sc)->port_res), \
 		rman_get_bushandle((sc)->port_res), \
-		(sc)->asic_offset + (port), (u_int32_t *)(addr), (count))
+		(sc)->asic_offset + (port), (uint32_t *)(addr), (count))
 
 void	ed_release_resources	(device_t);
 int	ed_alloc_port		(device_t, int, int);