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

Next file: linux/drivers/net/de4x5.c
Previous file: linux/drivers/net/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.4/linux/drivers/net/Space.c linux/drivers/net/Space.c
@@ -38,6 +38,7 @@
    ethernet adaptor have the name "eth[0123...]".
    */
 
+extern int hp100_probe(struct device *dev);
 extern int ultra_probe(struct device *dev);
 extern int wd_probe(struct device *dev);
 extern int el2_probe(struct device *dev);
@@ -74,12 +75,15 @@
 static int
 ethif_probe(struct device *dev)
 {
-    short base_addr = dev->base_addr;
+    u_long base_addr = dev->base_addr;
 
-    if (base_addr < 0  ||  base_addr == 1)
+    if ((base_addr == 0xffe0)  ||  (base_addr == 1))
 	return 1;		/* ENXIO */
 
     if (1
+#if defined(CONFIG_HP100)
+	&& hp100_probe(dev)
+#endif	
 #if defined(CONFIG_ULTRA)
 	&& ultra_probe(dev)
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this