Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv18198/drivers/net
Modified Files:
Makefile Space.c
Log Message:
Merge with 2.5.61
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Makefile 4 Aug 2003 12:18:14 -0000 1.23
+++ Makefile 5 Aug 2003 23:17:56 -0000 1.24
@@ -33,6 +33,7 @@
obj-$(CONFIG_DGRS) += dgrs.o
obj-$(CONFIG_RCPCI) += rcpci.o
obj-$(CONFIG_VORTEX) += 3c59x.o
+obj-$(CONFIG_TYPHOON) += typhoon.o
obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
obj-$(CONFIG_PCNET32) += pcnet32.o mii.o
obj-$(CONFIG_EEPRO100) += eepro100.o mii.o
Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Space.c 4 Aug 2003 12:18:14 -0000 1.10
+++ Space.c 5 Aug 2003 23:17:56 -0000 1.11
@@ -226,9 +226,6 @@
#ifdef CONFIG_EL2 /* 3c503 */
{el2_probe, 0},
#endif
-#ifdef CONFIG_EL3
- {el3_probe, 0},
-#endif
#ifdef CONFIG_HPLAN
{hp_probe, 0},
#endif
@@ -568,6 +565,8 @@
#ifdef CONFIG_TR
/* Token-ring device probe */
extern int ibmtr_probe(struct net_device *);
+extern int sk_isa_probe(struct net_device *);
+extern int proteon_probe(struct net_device *);
extern int smctr_probe(struct net_device *);
static int
@@ -576,6 +575,12 @@
if (1
#ifdef CONFIG_IBMTR
&& ibmtr_probe(dev)
+#endif
+#ifdef CONFIG_SKISA
+ && sk_isa_probe(dev)
+#endif
+#ifdef CONFIG_PROTEON
+ && proteon_probe(dev)
#endif
#ifdef CONFIG_SMCTR
&& smctr_probe(dev)
|
