Index: oldkernel/linux/drivers/net/de4x5.c
diff -u linux/drivers/net/de4x5.c:1.1.1.1 linux/drivers/net/de4x5.c:1.2
--- linux/drivers/net/de4x5.c:1.1.1.1	Wed May 31 12:33:49 2000
+++ linux/drivers/net/de4x5.c	Wed May 31 14:39:39 2000
@@ -985,7 +985,7 @@
 static void    srom_repair(struct device *dev, int card);
 static int     test_bad_enet(struct device *dev, int status);
 static int     an_exception(struct bus_type *lp);
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__) && !defined(__i386__)
 static void    eisa_probe(struct device *dev, u_long iobase);
 #endif
 static void    pci_probe(struct device *dev, u_long iobase);
@@ -1034,7 +1034,7 @@
 #endif /* MODULE */
 
 static char name[DE4X5_NAME_LENGTH + 1];
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__) && !defined(__i386__)
 static u_char de4x5_irq[] = EISA_ALLOWED_IRQ_LIST;
 static int lastEISA = 0;
 #  ifdef DE4X5_FORCE_EISA                 /* Force an EISA bus probe or not */
@@ -1112,7 +1112,7 @@
     u_long iobase = dev->base_addr;
 
     pci_probe(dev, iobase);
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__) && !defined(__i386__)
     if ((lastPCI == NO_MORE_PCI) && ((num_de4x5s == 0) || forceEISA)) {
         eisa_probe(dev, iobase);
     }
@@ -2049,7 +2049,7 @@
     return;
 }
 
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__) && !defined(__i386__)
 /*
 ** EISA bus I/O device probe. Probe from slot 1 since slot 0 is usually
 ** the motherboard. Upto 15 EISA devices are supported.
@@ -5339,7 +5339,7 @@
 	t = *q;
 	*q = '\0';
 
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__) && !defined(__i386__)
 	if (strstr(p, "force_eisa") || strstr(p, "FORCE_EISA")) forceEISA = 1;
 #endif
 	if (strstr(p, "fdx") || strstr(p, "FDX")) lp->params.fdx = 1;
@@ -5833,7 +5833,7 @@
     u_int class = DE4X5_CLASS_CODE;
     u_int device;
 
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__) && !defined(__i386__)
     char name[DE4X5_STRLEN];
     u_long iobase = 0x1000;