diff -urN -X /home/jgarzik/dontdiff /home/jgarzik/tmp/linux-2.4.11-pre6/drivers/net/at1700.c linux_2_4/drivers/net/at1700.c
--- /home/jgarzik/tmp/linux-2.4.11-pre6/drivers/net/at1700.c	Tue Oct  9 00:03:50 2001
+++ linux_2_4/drivers/net/at1700.c	Sun Oct  7 14:07:14 2001
@@ -471,12 +471,12 @@
 #define EE_READ_CMD		(6 << 6)
 #define EE_ERASE_CMD	(7 << 6)
 
-static int __init read_eeprom(int ioaddr, int location)
+static int __init read_eeprom(long ioaddr, int location)
 {
 	int i;
 	unsigned short retval = 0;
-	int ee_addr = ioaddr + EEPROM_Ctrl;
-	int ee_daddr = ioaddr + EEPROM_Data;
+	long ee_addr = ioaddr + EEPROM_Ctrl;
+	long ee_daddr = ioaddr + EEPROM_Data;
 	int read_cmd = location | EE_READ_CMD;
 
 	/* Shift the read command bits out. */
diff -urN -X /home/jgarzik/dontdiff /home/jgarzik/tmp/linux-2.4.11-pre6/drivers/net/winbond-840.c linux_2_4/drivers/net/winbond-840.c
--- /home/jgarzik/tmp/linux-2.4.11-pre6/drivers/net/winbond-840.c	Tue Oct  9 00:03:55 2001
+++ linux_2_4/drivers/net/winbond-840.c	Sun Oct  7 14:07:32 2001
@@ -557,7 +557,7 @@
 {
 	int i;
 	int retval = 0;
-	int ee_addr = addr + EECtrl;
+	long ee_addr = addr + EECtrl;
 	int read_cmd = location | EE_ReadCmd;
 	writel(EE_ChipSelect, ee_addr);