[LV-commit] CVS: kernel-2.5/drivers/net Makefile,1.19,1.20 Space.c,1.7,1.8

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv31393/drivers/net

Modified Files:
	Makefile Space.c 
Log Message:
Merge with 2.5.51


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile	15 Jun 2003 23:29:22 -0000	1.19
+++ Makefile	7 Jul 2003 23:47:31 -0000	1.20
@@ -184,6 +184,10 @@
 obj-$(CONFIG_MAC89x0) += mac89x0.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_DL2K) += dl2k.o
+obj-$(CONFIG_R8169) += r8169.o
+
+# non-drivers/net drivers who want mii lib
+obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o
 
 obj-$(CONFIG_ARCH_ACORN) += ../acorn/net/
 obj-$(CONFIG_NET_FC) += fc/

Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Space.c	21 Apr 2003 22:55:50 -0000	1.7
+++ Space.c	7 Jul 2003 23:47:31 -0000	1.8
@@ -48,7 +48,6 @@
 extern int hp100_probe(struct net_device *dev);
 extern int ultra_probe(struct net_device *dev);
 extern int ultra32_probe(struct net_device *dev);
-extern int ultramca_probe(struct net_device *dev);
 extern int wd_probe(struct net_device *dev);
 extern int el2_probe(struct net_device *dev);
 extern int ne_probe(struct net_device *dev);
@@ -107,7 +106,6 @@
 extern int vax_sgec_probe(struct net_device *);
   
 /* Detachable devices ("pocket adaptors") */
-extern int de600_probe(struct net_device *);
 extern int de620_probe(struct net_device *);
 
 /* FDDI adapters */
@@ -194,9 +192,6 @@
 
 
 static struct devprobe mca_probes[] __initdata = {
-#ifdef CONFIG_ULTRAMCA 
-	{ultramca_probe, 0},
-#endif
 #ifdef CONFIG_NE2_MCA
 	{ne2_probe, 0},
 #endif
@@ -317,9 +312,6 @@
 };
 
 static struct devprobe parport_probes[] __initdata = {
-#ifdef CONFIG_DE600		/* D-Link DE-600 adapter */
-	{de600_probe, 0},
-#endif
 #ifdef CONFIG_DE620		/* D-Link DE-620 adapter */
 	{de620_probe, 0},
 #endif