diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 81ba280da457..c4ac81297e29 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -79,17 +79,17 @@ typedef void isa_config_cb(void *arg, struct isa_config *config, int enable);
  * ISA_ADD_CONFIG().
  */
 struct isa_range {
-	u_int32_t		ir_start;
-	u_int32_t		ir_end;
-	u_int32_t		ir_size;
-	u_int32_t		ir_align;
+	uint32_t		ir_start;
+	uint32_t		ir_end;
+	uint32_t		ir_size;
+	uint32_t		ir_align;
 };
 
 struct isa_config {
 	struct isa_range	ic_mem[ISA_NMEM];
 	struct isa_range	ic_port[ISA_NPORT];
-	u_int32_t		ic_irqmask[ISA_NIRQ];
-	u_int32_t		ic_drqmask[ISA_NDRQ];
+	uint32_t		ic_irqmask[ISA_NIRQ];
+	uint32_t		ic_drqmask[ISA_NDRQ];
 	int			ic_nmem;
 	int			ic_nport;
 	int			ic_nirq;
@@ -100,7 +100,7 @@ struct isa_config {
  * Used to build lists of IDs and description strings for PnP drivers.
  */
 struct isa_pnp_id {
-	u_int32_t		ip_id;
+	uint32_t		ip_id;
 	const char		*ip_desc;
 };
 
diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c
index 979389f59808..a2716f513d52 100644
--- a/sys/isa/pnpparse.c
+++ b/sys/isa/pnpparse.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 #define I32(p)	(I16(p) + (I16((p)+2) << 16))
 
 void
-pnp_printf(u_int32_t id, char *fmt, ...)
+pnp_printf(uint32_t id, char *fmt, ...)
 {
 	va_list ap;
 
@@ -64,8 +64,8 @@ pnp_parse_desc(device_t dev, u_char tag, u_char *res, int len,
 	       struct isa_config *config, int ldn)
 {
 	char buf[100];
-	u_int32_t id;
-	u_int32_t compat_id;
+	uint32_t id;
+	uint32_t compat_id;
 	int temp;
 
 	id = isa_get_logicalid(dev);
@@ -414,7 +414,7 @@ pnp_parse_resources(device_t dev, u_char *resources, int len, int ldn)
 	u_char *start;
 	u_char *p;
 	u_char tag;
-	u_int32_t id;
+	uint32_t id;
 	int ncfgs;
 	int l;
 	int i;