diff -u --new-file --exclude-from ../exclude --recursive linux.vanilla/drivers/net/82596.c linux.15p6/drivers/net/82596.c
--- linux.vanilla/drivers/net/82596.c	Thu Jan  7 16:46:59 1999
+++ linux.15p6/drivers/net/82596.c	Wed Jan 12 01:16:34 2000
@@ -283,7 +283,7 @@
 		volatile u32 i = *(volatile u32 *) (dev->base_addr);
 	}
 #endif
-#ifdef CONFIG_APRICOT_i596
+#ifdef CONFIG_APRICOT
 	if (MACH_IS_APRICOT) {
 		outw(0, (short) (dev->base_addr) + 4);
 	}
@@ -444,7 +444,7 @@
 	if (MACH_IS_BVME6000)
 		lp->scp.sysbus = 0x0000004c;
 #endif
-#ifdef CONFIG_APRICOT_i596
+#ifdef CONFIG_APRICOT
 	if (MACH_IS_APRICOT)
 		lp->scp.sysbus = 0x00440000;
 #endif
@@ -914,7 +914,7 @@
 		dev->irq = (unsigned) BVME_IRQ_I596;
 	}
 #endif
-#ifdef CONFIG_APRICOT_INTEL
+#ifdef CONFIG_APRICOT
 	int checksum = 0;
 	int ioaddr = 0x300;
 
@@ -1163,7 +1163,7 @@
 		*ethirq = 3;
 	}
 #endif
-#ifdef CONFIG_APRICOT_INTEL
+#ifdef CONFIG_APRICOT
 	(void) inb(ioaddr + 0x10);
 	outb(4, ioaddr + 0xf);
 #endif