--- src/sys/dev/netif/ti/ti_fw2.h	2003/06/17 04:28:57	1.2
+++ src/sys/dev/netif/ti/ti_fw2.h	2005/05/31 10:44:13	1.3
@@ -8,23 +8,23 @@
  * modes in some cases.
  *
  * $FreeBSD: src/sys/pci/ti_fw2.h,v 1.6.2.3 2000/08/24 00:07:57 wpaul Exp $
- * $DragonFly: src/sys/pci/ti_fw2.h,v 1.1 2003/06/16 06:45:45 dillon Exp $
+ * $DragonFly$
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x4;
 static int tigon2FwReleaseFix = 0xd;
-static u_int32_t tigon2FwStartAddr = 0x00004000;
-static u_int32_t tigon2FwTextAddr = 0x00004000;
+static uint32_t tigon2FwStartAddr = 0x00004000;
+static uint32_t tigon2FwTextAddr = 0x00004000;
 static int tigon2FwTextLen = 0x11c80;
-static u_int32_t tigon2FwRodataAddr = 0x00015c80;
+static uint32_t tigon2FwRodataAddr = 0x00015c80;
 static int tigon2FwRodataLen = 0x10d0;
-static u_int32_t tigon2FwDataAddr = 0x00016d80;
+static uint32_t tigon2FwDataAddr = 0x00016d80;
 static int tigon2FwDataLen = 0x1c0;
-static u_int32_t tigon2FwSbssAddr = 0x00016f40;
+static uint32_t tigon2FwSbssAddr = 0x00016f40;
 static int tigon2FwSbssLen = 0xcc;
-static u_int32_t tigon2FwBssAddr = 0x00017010;
+static uint32_t tigon2FwBssAddr = 0x00017010;
 static int tigon2FwBssLen = 0x20c0;
-static u_int32_t tigon2FwText[] = {
+static uint32_t tigon2FwText[] = {
 0x0, 
 0x10000003, 0x0, 0xd, 0xd, 
 0x3c1d0001, 0x8fbd6de0, 0x3a0f021, 0x3c100000, 
@@ -4578,7 +4578,7 @@ static u_int32_t tigon2FwText[] = {
 0x24020001, 0x8f430328, 0x1021, 0x24630001, 
 0x3e00008, 0xaf430328, 0x3e00008, 0x0, 
 0x0, 0x0, 0x0, 0x0 };
-static u_int32_t tigon2FwRodata[] = {
+static uint32_t tigon2FwRodata[] = {
 0x24486561, 
 0x6465723a, 0x202f7072, 0x6f6a6563, 0x74732f72, 
 0x63732f73, 0x772f6765, 0x2f2e2f6e, 0x69632f66, 
@@ -4849,7 +4849,7 @@ static u_int32_t tigon2FwRodata[] = {
 0x0, 0x14f98, 0x14f98, 0x14c4c, 
 0x14c98, 0x14ce4, 0x14f98, 0x7365746d, 
 0x61636163, 0x74000000, 0x0, 0x0 };
-static u_int32_t tigon2FwData[] = {
+static uint32_t tigon2FwData[] = {
 0x1, 
 0x1, 0x1, 0xc001fc, 0x3ffc, 
 0xc00000, 0x46726565, 0x42534420, 0x5469676f,