Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv20410/drivers/net
Modified Files:
Makefile Space.c
Log Message:
Merge with 2.5.60
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile 21 Jul 2003 23:52:05 -0000 1.22
+++ Makefile 4 Aug 2003 12:18:14 -0000 1.23
@@ -2,12 +2,6 @@
# Makefile for the Linux network (ethercard) device drivers.
#
-# All of the (potential) objects that export symbols.
-# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
-
-export-objs := 8390.o arlan.o aironet4500_core.o aironet4500_card.o \
- ppp_async.o ppp_generic.o slhc.o pppox.o auto_irq.o \
- net_init.o mii.o
rcpci-objs := rcpci45.o rclanmtl.o
ifeq ($(CONFIG_ISDN_PPP),y)
@@ -63,6 +57,7 @@
# end link order section
#
+obj-$(CONFIG_MII) += mii.o
obj-$(CONFIG_AIRONET4500) += aironet4500_core.o
obj-$(CONFIG_AIRONET4500_CS) += aironet4500_core.o
obj-$(CONFIG_AIRONET4500_NONCS) += aironet4500_card.o
@@ -201,3 +196,6 @@
obj-$(CONFIG_NET_TULIP) += tulip/
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
+
+
+include $(TOPDIR)/drivers/usb/net/Makefile.mii
Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Space.c 3 Aug 2003 18:28:35 -0000 1.9
+++ Space.c 4 Aug 2003 12:18:14 -0000 1.10
@@ -226,6 +226,9 @@
#ifdef CONFIG_EL2 /* 3c503 */
{el2_probe, 0},
#endif
+#ifdef CONFIG_EL3
+ {el3_probe, 0},
+#endif
#ifdef CONFIG_HPLAN
{hp_probe, 0},
#endif
|
