[LV-k25-commit] CVS: kernel-2.5/drivers/net Makefile,1.9,1.10 Space.c,1.3,1.4

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

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

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


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	14 Dec 2002 22:12:28 -0000	1.9
+++ Makefile	16 Dec 2002 01:06:00 -0000	1.10
@@ -41,7 +41,7 @@
 subdir-$(CONFIG_WAN) += wan
 subdir-$(CONFIG_NET_FC) += fc
 subdir-$(CONFIG_ARCNET) += arcnet
-subdir-$(CONFIG_APPLETALK) += appletalk
+subdir-$(CONFIG_DEV_APPLETALK) += appletalk
 subdir-$(CONFIG_SK98LIN) += sk98lin
 subdir-$(CONFIG_SKFP) += skfp
 
@@ -221,16 +221,6 @@
 mod-subdirs	+= ../acorn/net
 subdir-y	+= ../acorn/net
 obj-y		+= ../acorn/net/acorn-net.o
-endif
-
-#
-# HIPPI adapters
-#
-
-ifneq ($(ARCH),s390)
-ifneq ($(ARCH),s390x)
-obj-y += auto_irq.o
-endif
 endif
 
 include $(TOPDIR)/Rules.make

Index: Space.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/net/Space.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Space.c	12 Dec 2002 01:47:14 -0000	1.3
+++ Space.c	16 Dec 2002 01:06:00 -0000	1.4
@@ -711,37 +711,37 @@
 	next:		NEXT_DEV,
 	init:		sbni_probe,
 };
-static struct net_device sbni6_dev =
+static struct net_device sbni6_dev = {
 	name:		"sbni6",
 	next:		&sbni7_dev,
 	init:		sbni_probe,
 };
-static struct net_device sbni5_dev =
+static struct net_device sbni5_dev = {
 	name:		"sbni5",
 	next:		&sbni6_dev,
 	init:		sbni_probe,
 };
-static struct net_device sbni4_dev =
+static struct net_device sbni4_dev = {
 	name:		"sbni4",
 	next:		&sbni5_dev,
 	init:		sbni_probe,
 };
-static struct net_device sbni3_dev =
+static struct net_device sbni3_dev = {
 	name:		"sbni3",
 	next:		&sbni4_dev,
 	init:		sbni_probe,
 };
-static struct net_device sbni2_dev =
+static struct net_device sbni2_dev = {
 	name:		"sbni2",
 	next:		&sbni3_dev,
 	init:		sbni_probe,
 };
-static struct net_device sbni1_dev =
+static struct net_device sbni1_dev = {
 	name:		"sbni1",
 	next:		&sbni2_dev,
 	init:		sbni_probe,
 };
-static struct net_device sbni0_dev =
+static struct net_device sbni0_dev = {
 	name:		"sbni0",
 	next:		&sbni1_dev,
 	init:		sbni_probe,