diff -urN -X /home/jgarzik/dontdiff /home/jgarzik/tmp/linux-2.4.11-pre6/drivers/net/hamachi.c linux_2_4/drivers/net/hamachi.c
--- /home/jgarzik/tmp/linux-2.4.11-pre6/drivers/net/hamachi.c	Tue Oct  9 00:03:51 2001
+++ linux_2_4/drivers/net/hamachi.c	Tue Oct  9 03:49:28 2001
@@ -514,8 +514,8 @@
 	int mii_cnt;								/* MII device addresses. */
 	u16 advertising;							/* NWay media advertisement */
 	unsigned char phys[MII_CNT];		/* MII device addresses, only first one used. */
-	u_int32_t rx_int_var, tx_int_var;	/* interrupt control variables */
-	u_int32_t option;							/* Hold on to a copy of the options */
+	u32 rx_int_var, tx_int_var;	/* interrupt control variables */
+	u32 option;							/* Hold on to a copy of the options */
 	struct pci_dev *pci_dev;
 };
 
@@ -846,8 +846,8 @@
 	struct hamachi_private *hmp = dev->priv;
 	long ioaddr = dev->base_addr;
 	int i;
-	u_int32_t rx_int_var, tx_int_var;
-	u_int16_t fifo_info;
+	u32 rx_int_var, tx_int_var;
+	u16 fifo_info;
 
 	i = request_irq(dev->irq, &hamachi_interrupt, SA_SHIRQ, dev->name, dev);
 	if (i)