patch-2.1.23 linux/drivers/net/Space.c

• Lines: 62
• Date: Sun Jan 26 12:07:17 1997
• Orig file: v2.1.22/linux/drivers/net/Space.c
• Orig date: Thu Jan 2 15:55:16 1997

diff -u --recursive --new-file v2.1.22/linux/drivers/net/Space.c linux/drivers/net/Space.c
@@ -277,24 +277,31 @@
 #ifndef ETH0_IRQ
 # define ETH0_IRQ 0
 #endif
+
+#ifndef __sparc__
+#define ETH_NOPROBE_ADDR 0xffe0
+#else
+#define ETH_NOPROBE_ADDR 0
+#endif
+
 /* "eth0" defaults to autoprobe (== 0), other use a base of 0xffe0 (== -0x20),
    which means "don't probe".  These entries exist to only to provide empty
    slots which may be enabled at boot-time. */
 
 static struct device eth7_dev = {
-    "eth7", 0,0,0,0,0xffe0 /* I/O base*/, 0,0,0,0, NEXT_DEV, ethif_probe };
+    "eth7", 0,0,0,0,ETH_NOPROBE_ADDR /* I/O base*/, 0,0,0,0, NEXT_DEV, ethif_probe };
 static struct device eth6_dev = {
-    "eth6", 0,0,0,0,0xffe0 /* I/O base*/, 0,0,0,0, &eth7_dev, ethif_probe };
+    "eth6", 0,0,0,0,ETH_NOPROBE_ADDR /* I/O base*/, 0,0,0,0, &eth7_dev, ethif_probe };
 static struct device eth5_dev = {
-    "eth5", 0,0,0,0,0xffe0 /* I/O base*/, 0,0,0,0, &eth6_dev, ethif_probe };
+    "eth5", 0,0,0,0,ETH_NOPROBE_ADDR /* I/O base*/, 0,0,0,0, &eth6_dev, ethif_probe };
 static struct device eth4_dev = {
-    "eth4", 0,0,0,0,0xffe0 /* I/O base*/, 0,0,0,0, &eth5_dev, ethif_probe };
+    "eth4", 0,0,0,0,ETH_NOPROBE_ADDR /* I/O base*/, 0,0,0,0, &eth5_dev, ethif_probe };
 static struct device eth3_dev = {
-    "eth3", 0,0,0,0,0xffe0 /* I/O base*/, 0,0,0,0, &eth4_dev, ethif_probe };
+    "eth3", 0,0,0,0,ETH_NOPROBE_ADDR /* I/O base*/, 0,0,0,0, &eth4_dev, ethif_probe };
 static struct device eth2_dev = {
-    "eth2", 0,0,0,0,0xffe0 /* I/O base*/, 0,0,0,0, &eth3_dev, ethif_probe };
+    "eth2", 0,0,0,0,ETH_NOPROBE_ADDR /* I/O base*/, 0,0,0,0, &eth3_dev, ethif_probe };
 static struct device eth1_dev = {
-    "eth1", 0,0,0,0,0xffe0 /* I/O base*/, 0,0,0,0, &eth2_dev, ethif_probe };
+    "eth1", 0,0,0,0,ETH_NOPROBE_ADDR /* I/O base*/, 0,0,0,0, &eth2_dev, ethif_probe };
 
 static struct device eth0_dev = {
     "eth0", 0, 0, 0, 0, ETH0_ADDR, ETH0_IRQ, 0, 0, 0, &eth1_dev, ethif_probe };
@@ -446,19 +453,20 @@
 
 #endif
 
-#ifdef CONFIG_AP1000
+#ifdef CONFIG_APFDDI
     extern int apfddi_init(struct device *dev);
     static struct device fddi_dev = {
 	"fddi", 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NEXT_DEV, apfddi_init };
 #   undef       NEXT_DEV
 #   define      NEXT_DEV        (&fddi_dev)
+#endif
 
+#ifdef CONFIG_APBIF
     extern int bif_init(struct device *dev);
     static struct device bif_dev = {
         "bif", 0x0, 0x0, 0x0, 0x0, 0, 0, 0, 0, 0, NEXT_DEV, bif_init };
 #   undef       NEXT_DEV
 #   define      NEXT_DEV        (&bif_dev)
-
 #endif
 	
 extern int loopback_init(struct device *dev);