Update of /cvsroot/linux-vax/kernel-2.5/drivers/net
In directory sc8-pr-cvs1:/tmp/cvs-serv17870/drivers/net
Modified Files:
Makefile Space.c
Log Message:
Merge with 2.5.71
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile 28 Aug 2003 22:30:25 -0000 1.28
+++ Makefile 7 Sep 2003 15:00:49 -0000 1.29
@@ -65,7 +65,7 @@
obj-$(CONFIG_WINBOND_840) += mii.o
obj-$(CONFIG_SUNDANCE) += sundance.o mii.o
obj-$(CONFIG_HAMACHI) += hamachi.o mii.o
-obj-$(CONFIG_NET) += Space.o setup.o net_init.o loopback.o
+obj-$(CONFIG_NET) += Space.o net_init.o loopback.o
obj-$(CONFIG_SEEQ8005) += seeq8005.o
obj-$(CONFIG_ETHERTAP) += ethertap.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
@@ -175,7 +175,7 @@
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_DL2K) += dl2k.o
obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
+obj-$(CONFIG_AMD8111_ETH) += amd8111e.o mii.o
# non-drivers/net drivers who want mii lib
obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o
Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Space.c 28 Aug 2003 22:30:25 -0000 1.13
+++ Space.c 7 Sep 2003 15:00:49 -0000 1.14
@@ -107,9 +107,6 @@
/* Detachable devices ("pocket adaptors") */
extern int de620_probe(struct net_device *);
-/* FDDI adapters */
-extern int skfp_probe(struct net_device *dev);
-
/* Fibre Channel adapters */
extern int iph5526_probe(struct net_device *dev);
@@ -415,29 +412,6 @@
return -ENODEV;
}
-#ifdef CONFIG_FDDI
-static int __init fddiif_probe(struct net_device *dev)
-{
- unsigned long base_addr = dev->base_addr;
-
- if (base_addr == 1)
- return 1; /* ENXIO */
-
- if (1
-#ifdef CONFIG_APFDDI
- && apfddi_init(dev)
-#endif
-#ifdef CONFIG_SKFP
- && skfp_probe(dev)
-#endif
- && 1 ) {
- return 1; /* -ENODEV or -EAGAIN would be more accurate. */
- }
- return 0;
-}
-#endif
-
-
#ifdef CONFIG_NET_FC
static int fcif_probe(struct net_device *dev)
{
@@ -628,52 +602,6 @@
#define NEXT_DEV (&tr0_dev)
#endif
-
-#ifdef CONFIG_FDDI
-static struct net_device fddi7_dev = {
- .name = "fddi7",
- .next = NEXT_DEV,
- .init = fddiif_probe
-};
-static struct net_device fddi6_dev = {
- .name = "fddi6",
- .next = &fddi7_dev,
- .init = fddiif_probe
-};
-static struct net_device fddi5_dev = {
- .name = "fddi5",
- .next = &fddi6_dev,
- .init = fddiif_probe
-};
-static struct net_device fddi4_dev = {
- .name = "fddi4",
- .next = &fddi5_dev,
- .init = fddiif_probe
-};
-static struct net_device fddi3_dev = {
- .name = "fddi3",
- .next = &fddi4_dev,
- .init = fddiif_probe
-};
-static struct net_device fddi2_dev = {
- .name = "fddi2",
- .next = &fddi3_dev,
- .init = fddiif_probe
-};
-static struct net_device fddi1_dev = {
- .name = "fddi1",
- .next = &fddi2_dev,
- .init = fddiif_probe
-};
-static struct net_device fddi0_dev = {
- .name = "fddi0",
- .next = &fddi1_dev,
- .init = fddiif_probe
-};
-#undef NEXT_DEV
-#define NEXT_DEV (&fddi0_dev)
-#endif
-
#ifdef CONFIG_NET_FC
static struct net_device fc1_dev = {
|
