patch-2.4.25 linux-2.4.25/drivers/net/de4x5.c
Next file: linux-2.4.25/drivers/net/declance.c
Previous file: linux-2.4.25/drivers/net/au1000_eth.h
Back to the patch index
Back to the overall index
- Lines: 54
- Date:
2004-02-18 05:36:31.000000000 -0800
- Orig file:
linux-2.4.24/drivers/net/de4x5.c
- Orig date:
2003-06-13 07:51:34.000000000 -0700
diff -urN linux-2.4.24/drivers/net/de4x5.c linux-2.4.25/drivers/net/de4x5.c
@@ -999,7 +999,7 @@
static void srom_repair(struct net_device *dev, int card);
static int test_bad_enet(struct net_device *dev, int status);
static int an_exception(struct de4x5_bus_type *lp);
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#ifdef CONFIG_EISA
static void eisa_probe(struct net_device *dev, u_long iobase);
#endif
static void pci_probe(struct net_device *dev, u_long iobase);
@@ -1053,7 +1053,7 @@
#endif /* MODULE */
static char name[DE4X5_NAME_LENGTH + 1];
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#ifdef CONFIG_EISA
static u_char de4x5_irq[] = EISA_ALLOWED_IRQ_LIST;
static int lastEISA;
# ifdef DE4X5_FORCE_EISA /* Force an EISA bus probe or not */
@@ -1131,7 +1131,7 @@
u_long iobase = dev->base_addr;
pci_probe(dev, iobase);
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#ifdef CONFIG_EISA
if ((lastPCI == NO_MORE_PCI) && ((num_de4x5s == 0) || forceEISA)) {
eisa_probe(dev, iobase);
}
@@ -2093,7 +2093,7 @@
return;
}
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#ifdef CONFIG_EISA
/*
** EISA bus I/O device probe. Probe from slot 1 since slot 0 is usually
** the motherboard. Upto 15 EISA devices are supported.
@@ -5363,7 +5363,7 @@
t = *q;
*q = '\0';
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#ifdef CONFIG_EISA
if (strstr(p, "force_eisa") || strstr(p, "FORCE_EISA")) forceEISA = 1;
#endif
if (strstr(p, "fdx") || strstr(p, "FDX")) lp->params.fdx = 1;
@@ -5865,7 +5865,7 @@
u_int class = DE4X5_CLASS_CODE;
u_int device;
-#if !defined(__sparc_v9__) && !defined(__powerpc__) && !defined(__alpha__)
+#ifdef CONFIG_EISA
char name[DE4X5_STRLEN];
u_long iobase = 0x1000;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)