Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@mandrakesoft.com>2002-03-06 19:35:22 -0500
committerJeff Garzik <jgarzik@mandrakesoft.com>2002-03-06 19:35:22 -0500
commit58c1bd4cfd0f1d25e13043fb08841c0e848f381c (patch)
tree1fc6bea3b5e735111e0f0641e024e088bbef7705
parent86bfa5eaa899a2372a1d4994a52d8444527781af (diff)
Move dmfe, winbond-840, xircom_cb, xircom_tulip_cb, de2104x and de4x5
net drivers to drivers/net/tulip directory.
-rw-r--r--Makefile1
-rw-r--r--drivers/net/Config.help83
-rw-r--r--drivers/net/Config.in12
-rw-r--r--drivers/net/Makefile13
-rw-r--r--drivers/net/pcmcia/Config.in5
-rw-r--r--drivers/net/pcmcia/Makefile5
-rw-r--r--drivers/net/tulip/Config.help110
-rw-r--r--drivers/net/tulip/Config.in27
-rw-r--r--drivers/net/tulip/Makefile39
-rw-r--r--drivers/net/tulip/de2104x.c (renamed from drivers/net/de2104x.c)0
-rw-r--r--drivers/net/tulip/de4x5.c (renamed from drivers/net/de4x5.c)0
-rw-r--r--drivers/net/tulip/de4x5.h (renamed from drivers/net/de4x5.h)0
-rw-r--r--drivers/net/tulip/dmfe.c (renamed from drivers/net/dmfe.c)0
-rw-r--r--drivers/net/tulip/winbond-840.c (renamed from drivers/net/winbond-840.c)0
-rw-r--r--drivers/net/tulip/xircom_cb.c (renamed from drivers/net/pcmcia/xircom_cb.c)0
-rw-r--r--drivers/net/tulip/xircom_tulip_cb.c (renamed from drivers/net/pcmcia/xircom_tulip_cb.c)0
16 files changed, 173 insertions, 122 deletions
diff --git a/Makefile b/Makefile
index 513af2da5e0a..763dab7b3bc4 100644
--- a/Makefile
+++ b/Makefile
@@ -162,6 +162,7 @@ DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
DRIVERS-$(CONFIG_NET_PCMCIA) += drivers/net/pcmcia/pcmcia_net.o
DRIVERS-$(CONFIG_NET_WIRELESS) += drivers/net/wireless/wireless_net.o
+DRIVERS-$(CONFIG_NET_TULIP) += drivers/net/tulip/tulip_net.o
DRIVERS-$(CONFIG_PCMCIA_CHRDEV) += drivers/char/pcmcia/pcmcia_char.o
DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
diff --git a/drivers/net/Config.help b/drivers/net/Config.help
index 377517ec69de..2a1c47dfa8f9 100644
--- a/drivers/net/Config.help
+++ b/drivers/net/Config.help
@@ -1333,71 +1333,6 @@ CONFIG_APRICOT
<file:Documentation/networking/net-modules.txt>. The module will be
called apricot.o.
-CONFIG_DE4X5
- This is support for the DIGITAL series of PCI/EISA Ethernet cards.
- These include the DE425, DE434, DE435, DE450 and DE500 models. If
- you have a network card of this type, say Y and read the
- Ethernet-HOWTO, available from
- <http://www.linuxdoc.org/docs.html#howto>. More specific
- information is contained in
- <file:Documentation/networking/de4x5.txt>.
-
- This driver is also available as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called de4x5.o. If you want to compile it as a
- module, say M here and read <file:Documentation/modules.txt> as well
- as <file:Documentation/networking/net-modules.txt>.
-
-CONFIG_DE2104X
- This driver is developed for the SMC EtherPower series Ethernet
- cards and also works with cards based on the DECchip
- 21040 (Tulip series) chips. Some LinkSys PCI cards are
- of this type. (If your card is NOT SMC EtherPower 10/100 PCI
- (smc9332dst), you can also try the driver for "Generic DECchip"
- cards, above. However, most people with a network card of this type
- will say Y here.) Do read the Ethernet-HOWTO, available from
- <http://www.linuxdoc.org/docs.html#howto>. More specific
- information is contained in
- <file:Documentation/DocBook/tulip-user.tmpl>.
-
- This driver is also available as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called tulip.o. If you want to compile it as a
- module, say M here and read <file:Documentation/modules.txt> as well
- as <file:Documentation/networking/net-modules.txt>.
-
-CONFIG_TULIP
- This driver is developed for the SMC EtherPower series Ethernet
- cards and also works with cards based on the DECchip
- 21040/21041/21140 (Tulip series) chips. Some LinkSys PCI cards are
- of this type. (If your card is NOT SMC EtherPower 10/100 PCI
- (smc9332dst), you can also try the driver for "Generic DECchip"
- cards, above. However, most people with a network card of this type
- will say Y here.) Do read the Ethernet-HOWTO, available from
- <http://www.linuxdoc.org/docs.html#howto>. More specific
- information is contained in
- <file:Documentation/networking/tulip.txt>.
-
- This driver is also available as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called tulip.o. If you want to compile it as a
- module, say M here and read <file:Documentation/modules.txt> as well
- as <file:Documentation/networking/net-modules.txt>.
-
-CONFIG_TULIP_MWI
- This configures your Tulip card specifically for the card and
- system cache line size type you are using.
-
- This is experimental code, not yet tested on many boards.
-
- If unsure, say N.
-
-CONFIG_TULIP_MMIO
- Use PCI shared memory for the NIC registers, rather than going through
- the Tulip's PIO (programmed I/O ports). Faster, but could produce
- obscure bugs if your mainboard has memory controller timing issues.
- If in doubt, say N.
-
CONFIG_DGRS
This is support for the Digi International RightSwitch series of
PCI/EISA Ethernet switch cards. These include the SE-4 and the SE-6
@@ -1482,18 +1417,6 @@ CONFIG_VIA_RHINE_MMIO
If unsure, say N.
-CONFIG_DM9102
- This driver is for DM9102(A)/DM9132/DM9801 compatible PCI cards from
- Davicom (<http://www.davicom.com.tw/>). If you have such a network
- (Ethernet) card, say Y. Some information is contained in the file
- <file:Documentation/networking/dmfe.txt>.
-
- This driver is also available as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called dmfe.o. If you want to compile it as a
- module, say M here and read <file:Documentation/modules.txt> as well
- as <file:Documentation/networking/net-modules.txt>.
-
CONFIG_ES3210
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
@@ -1525,12 +1448,6 @@ CONFIG_SUNDANCE
More specific information and updates are available from
<http://www.scyld.com/network/sundance.html>.
-CONFIG_WINBOND_840
- This driver is for the Winbond W89c840 chip. It also works with
- the TX9882 chip on the Compex RL100-ATX board.
- More specific information and updates are available from
- <http://www.scyld.com/network/drivers.html>.
-
CONFIG_ZNET
The Zenith Z-Note notebook computer has a built-in network
(Ethernet) card, and this is the Linux driver for it. Note that the
diff --git a/drivers/net/Config.in b/drivers/net/Config.in
index 48878dcb331a..c715ce2ec6a8 100644
--- a/drivers/net/Config.in
+++ b/drivers/net/Config.in
@@ -155,17 +155,9 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
dep_tristate ' Apricot Xen-II on board Ethernet' CONFIG_APRICOT $CONFIG_ISA
dep_tristate ' CS89x0 support' CONFIG_CS89x0 $CONFIG_ISA
- dep_tristate ' Early DECchip Tulip (dc2104x) PCI support (EXPERIMENTAL)' CONFIG_DE2104X $CONFIG_PCI $CONFIG_EXPERIMENTAL
- dep_tristate ' DECchip Tulip (dc2114x) PCI support' CONFIG_TULIP $CONFIG_PCI
- if [ "$CONFIG_TULIP" = "y" -o "$CONFIG_TULIP" = "m" ]; then
- dep_bool ' New bus configuration (EXPERIMENTAL)' CONFIG_TULIP_MWI $CONFIG_EXPERIMENTAL
- bool ' Use PCI shared mem for NIC registers' CONFIG_TULIP_MMIO
- fi
if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
- tristate ' Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
tristate ' Digi Intl. RightSwitch SE-X support' CONFIG_DGRS
fi
- dep_tristate ' Davicom DM910x/DM980x support' CONFIG_DM9102 $CONFIG_PCI
dep_tristate ' EtherExpressPro/100 support (eepro100, original Becker driver)' CONFIG_EEPRO100 $CONFIG_PCI
dep_tristate ' EtherExpressPro/100 support (e100, Alternate Intel driver)' CONFIG_E100 $CONFIG_PCI
dep_tristate ' Mylex EISA LNE390A/B support (EXPERIMENTAL)' CONFIG_LNE390 $CONFIG_EISA $CONFIG_EXPERIMENTAL
@@ -191,7 +183,6 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; then
fi
dep_tristate ' VIA Rhine support' CONFIG_VIA_RHINE $CONFIG_PCI
dep_mbool ' Use MMIO instead of PIO (EXPERIMENTAL)' CONFIG_VIA_RHINE_MMIO $CONFIG_VIA_RHINE $CONFIG_EXPERIMENTAL
- dep_tristate ' Winbond W89c840 Ethernet support' CONFIG_WINBOND_840 $CONFIG_PCI
if [ "$CONFIG_OBSOLETE" = "y" ]; then
dep_bool ' Zenith Z-Note support (EXPERIMENTAL)' CONFIG_ZNET $CONFIG_ISA
fi
@@ -328,6 +319,9 @@ fi
source drivers/net/wan/Config.in
+if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" -o "$CONFIG_CARDBUS" != "n" ]; then
+ source drivers/net/tulip/Config.in
+fi
if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
source drivers/net/pcmcia/Config.in
fi
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 17839b158877..63b0e886f0fb 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -8,7 +8,7 @@ obj-m :=
obj-n :=
obj- :=
-mod-subdirs := appletalk arcnet fc irda tokenring pcmcia wireless wan
+mod-subdirs := appletalk arcnet fc irda tokenring tulip pcmcia wireless wan
O_TARGET := net.o
@@ -21,10 +21,6 @@ export-objs := 8390.o arlan.o aironet4500_core.o aironet4500_card.o \
list-multi := rcpci.o
rcpci-objs := rcpci45.o rclanmtl.o
-ifeq ($(CONFIG_TULIP),y)
- obj-y += tulip/tulip.o
-endif
-
ifeq ($(CONFIG_E100),y)
obj-y += e1000/e100.o
endif
@@ -38,7 +34,7 @@ endif
subdir-$(CONFIG_NET_PCMCIA) += pcmcia
subdir-$(CONFIG_NET_WIRELESS) += wireless
-subdir-$(CONFIG_TULIP) += tulip
+subdir-$(CONFIG_NET_TULIP) += tulip
subdir-$(CONFIG_E100) += e100
subdir-$(CONFIG_E1000) += e1000
subdir-$(CONFIG_IRDA) += irda
@@ -78,7 +74,6 @@ obj-$(CONFIG_EEPRO100) += eepro100.o
obj-$(CONFIG_TLAN) += tlan.o
obj-$(CONFIG_EPIC100) += epic100.o mii.o
obj-$(CONFIG_SIS900) += sis900.o
-obj-$(CONFIG_DM9102) += dmfe.o
obj-$(CONFIG_YELLOWFIN) += yellowfin.o
obj-$(CONFIG_ACENIC) += acenic.o
obj-$(CONFIG_VETH) += veth.o
@@ -109,7 +104,7 @@ obj-$(CONFIG_AIRONET4500_NONCS) += aironet4500_card.o
obj-$(CONFIG_AIRONET4500_PROC) += aironet4500_proc.o
obj-$(CONFIG_AIRONET4500_CS) += aironet4500_proc.o
-obj-$(CONFIG_WINBOND_840) += winbond-840.o mii.o
+obj-$(CONFIG_WINBOND_840) += mii.o
obj-$(CONFIG_SUNDANCE) += sundance.o
obj-$(CONFIG_HAMACHI) += hamachi.o
obj-$(CONFIG_NET) += Space.o setup.o net_init.o loopback.o
@@ -181,8 +176,6 @@ obj-$(CONFIG_LAN_SAA9730) += saa9730.o
obj-$(CONFIG_DEPCA) += depca.o
obj-$(CONFIG_EWRK3) += ewrk3.o
obj-$(CONFIG_ATP) += atp.o
-obj-$(CONFIG_DE4X5) += de4x5.o
-obj-$(CONFIG_DE2104X) += de2104x.o
obj-$(CONFIG_NI5010) += ni5010.o
obj-$(CONFIG_NI52) += ni52.o
obj-$(CONFIG_NI65) += ni65.o
diff --git a/drivers/net/pcmcia/Config.in b/drivers/net/pcmcia/Config.in
index 599913636e68..e412a1cb4028 100644
--- a/drivers/net/pcmcia/Config.in
+++ b/drivers/net/pcmcia/Config.in
@@ -20,11 +20,6 @@ if [ "$CONFIG_NET_PCMCIA" = "y" ]; then
dep_tristate ' IBM PCMCIA tokenring adapter support' CONFIG_PCMCIA_IBMTR $CONFIG_TR $CONFIG_PCMCIA
fi
- if [ "$CONFIG_CARDBUS" = "y" ]; then
- tristate ' Xircom CardBus support (new driver)' CONFIG_PCMCIA_XIRCOM
- tristate ' Xircom Tulip-like CardBus support (old driver)' CONFIG_PCMCIA_XIRTULIP
- fi
-
bool ' Pcmcia Wireless LAN' CONFIG_NET_PCMCIA_RADIO
if [ "$CONFIG_NET_PCMCIA_RADIO" = "y" ]; then
dep_tristate ' Aviator/Raytheon 2.4MHz wireless support' CONFIG_PCMCIA_RAYCS $CONFIG_PCMCIA
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index ab0268f875d9..24712eddb2b1 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -29,11 +29,6 @@ obj-$(CONFIG_PCMCIA_AXNET) += axnet_cs.o
obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
obj-$(CONFIG_AIRONET4500_CS) += aironet4500_cs.o
-# Cardbus client drivers
-obj-$(CONFIG_PCMCIA_XIRTULIP) += xircom_tulip_cb.o
-obj-$(CONFIG_PCMCIA_XIRCOM) += xircom_cb.o
-
obj-$(CONFIG_PCMCIA_IBMTR) += ibmtr_cs.o
include $(TOPDIR)/Rules.make
-
diff --git a/drivers/net/tulip/Config.help b/drivers/net/tulip/Config.help
new file mode 100644
index 000000000000..670ac0585970
--- /dev/null
+++ b/drivers/net/tulip/Config.help
@@ -0,0 +1,110 @@
+CONFIG_PCMCIA_XIRCOM
+ This driver is for the Digital "Tulip" Ethernet CardBus adapters.
+ It should work with most DEC 21*4*-based chips/ethercards, as well
+ as with work-alike chips from Lite-On (PNIC) and Macronix (MXIC) and
+ ASIX.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called xircom_cb.o. If you want to compile
+ it as a module, say M here and read
+ <file:Documentation/modules.txt>. If unsure, say N.
+
+CONFIG_PCMCIA_XIRTULIP
+ This driver is for the Digital "Tulip" Ethernet CardBus adapters.
+ It should work with most DEC 21*4*-based chips/ethercards, as well
+ as with work-alike chips from Lite-On (PNIC) and Macronix (MXIC) and
+ ASIX.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called xircom_tulip_cb.o. If you want to compile
+ it as a module, say M here and read
+ <file:Documentation/modules.txt>. If unsure, say N.
+
+CONFIG_DE2104X
+ This driver is developed for the SMC EtherPower series Ethernet
+ cards and also works with cards based on the DECchip
+ 21040 (Tulip series) chips. Some LinkSys PCI cards are
+ of this type. (If your card is NOT SMC EtherPower 10/100 PCI
+ (smc9332dst), you can also try the driver for "Generic DECchip"
+ cards, above. However, most people with a network card of this type
+ will say Y here.) Do read the Ethernet-HOWTO, available from
+ <http://www.linuxdoc.org/docs.html#howto>. More specific
+ information is contained in
+ <file:Documentation/DocBook/tulip-user.tmpl>.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called tulip.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt> as well
+ as <file:Documentation/networking/net-modules.txt>.
+
+CONFIG_TULIP
+ This driver is developed for the SMC EtherPower series Ethernet
+ cards and also works with cards based on the DECchip
+ 21040/21041/21140 (Tulip series) chips. Some LinkSys PCI cards are
+ of this type. (If your card is NOT SMC EtherPower 10/100 PCI
+ (smc9332dst), you can also try the driver for "Generic DECchip"
+ cards, above. However, most people with a network card of this type
+ will say Y here.) Do read the Ethernet-HOWTO, available from
+ <http://www.linuxdoc.org/docs.html#howto>. More specific
+ information is contained in
+ <file:Documentation/networking/tulip.txt>.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called tulip.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt> as well
+ as <file:Documentation/networking/net-modules.txt>.
+
+CONFIG_TULIP_MWI
+ This configures your Tulip card specifically for the card and
+ system cache line size type you are using.
+
+ This is experimental code, not yet tested on many boards.
+
+ If unsure, say N.
+
+CONFIG_TULIP_MMIO
+ Use PCI shared memory for the NIC registers, rather than going through
+ the Tulip's PIO (programmed I/O ports). Faster, but could produce
+ obscure bugs if your mainboard has memory controller timing issues.
+ If in doubt, say N.
+
+CONFIG_NET_TULIP
+ This selects the "Tulip" family of EISA/PCI network cards.
+
+CONFIG_DE4X5
+ This is support for the DIGITAL series of PCI/EISA Ethernet cards.
+ These include the DE425, DE434, DE435, DE450 and DE500 models. If
+ you have a network card of this type, say Y and read the
+ Ethernet-HOWTO, available from
+ <http://www.linuxdoc.org/docs.html#howto>. More specific
+ information is contained in
+ <file:Documentation/networking/de4x5.txt>.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called de4x5.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt> as well
+ as <file:Documentation/networking/net-modules.txt>.
+
+CONFIG_WINBOND_840
+ This driver is for the Winbond W89c840 chip. It also works with
+ the TX9882 chip on the Compex RL100-ATX board.
+ More specific information and updates are available from
+ <http://www.scyld.com/network/drivers.html>.
+
+CONFIG_DM9102
+ This driver is for DM9102(A)/DM9132/DM9801 compatible PCI cards from
+ Davicom (<http://www.davicom.com.tw/>). If you have such a network
+ (Ethernet) card, say Y. Some information is contained in the file
+ <file:Documentation/networking/dmfe.txt>.
+
+ This driver is also available as a module ( = code which can be
+ inserted in and removed from the running kernel whenever you want).
+ The module will be called dmfe.o. If you want to compile it as a
+ module, say M here and read <file:Documentation/modules.txt> as well
+ as <file:Documentation/networking/net-modules.txt>.
+
diff --git a/drivers/net/tulip/Config.in b/drivers/net/tulip/Config.in
new file mode 100644
index 000000000000..9096c6a4bc4f
--- /dev/null
+++ b/drivers/net/tulip/Config.in
@@ -0,0 +1,27 @@
+#
+# Tulip family network device configuration
+#
+
+mainmenu_option next_comment
+comment '"Tulip" family network device support'
+
+bool '"Tulip" family network device support' CONFIG_NET_TULIP
+if [ "$CONFIG_NET_TULIP" = "y" ]; then
+ dep_tristate ' Early DECchip Tulip (dc2104x) PCI support (EXPERIMENTAL)' CONFIG_DE2104X $CONFIG_PCI $CONFIG_EXPERIMENTAL
+ dep_tristate ' DECchip Tulip (dc2114x) PCI support' CONFIG_TULIP $CONFIG_PCI
+ if [ "$CONFIG_TULIP" = "y" -o "$CONFIG_TULIP" = "m" ]; then
+ dep_bool ' New bus configuration (EXPERIMENTAL)' CONFIG_TULIP_MWI $CONFIG_EXPERIMENTAL
+ bool ' Use PCI shared mem for NIC registers' CONFIG_TULIP_MMIO
+ fi
+ if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
+ tristate ' Generic DECchip & DIGITAL EtherWORKS PCI/EISA' CONFIG_DE4X5
+ fi
+ dep_tristate ' Winbond W89c840 Ethernet support' CONFIG_WINBOND_840 $CONFIG_PCI
+ dep_tristate ' Davicom DM910x/DM980x support' CONFIG_DM9102 $CONFIG_PCI
+ if [ "$CONFIG_CARDBUS" = "y" ]; then
+ tristate ' Xircom CardBus support (new driver)' CONFIG_PCMCIA_XIRCOM
+ tristate ' Xircom Tulip-like CardBus support (old driver)' CONFIG_PCMCIA_XIRTULIP
+ fi
+fi
+
+endmenu
diff --git a/drivers/net/tulip/Makefile b/drivers/net/tulip/Makefile
index b5b0767f80e3..2257b022b4bb 100644
--- a/drivers/net/tulip/Makefile
+++ b/drivers/net/tulip/Makefile
@@ -1,17 +1,36 @@
#
-# Makefile for the Tulip ethernet driver
+# drivers/net/tulip/Makefile
#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
+# Makefile for the Linux "Tulip" family network device drivers.
#
-# Note 2! The CFLAGS definitions are now in the main makefile...
-O_TARGET := tulip.o
+O_TARGET := tulip_net.o
-obj-y := eeprom.o interrupt.o media.o \
- timer.o tulip_core.o \
- 21142.o pnic.o pnic2.o
-obj-m := $(O_TARGET)
+obj-y :=
+obj-m :=
+obj-n :=
+obj- :=
+
+# Things that need to export symbols
+export-objs :=
+
+obj-$(CONFIG_PCMCIA_XIRTULIP) += xircom_tulip_cb.o
+obj-$(CONFIG_PCMCIA_XIRCOM) += xircom_cb.o
+obj-$(CONFIG_DM9102) += dmfe.o
+obj-$(CONFIG_WINBOND_840) += winbond-840.o
+obj-$(CONFIG_DE2104X) += de2104x.o
+obj-$(CONFIG_TULIP) += tulip.o
+obj-$(CONFIG_DE4X5) += de4x5.o
+
+# Declare multi-part drivers.
+list-multi := tulip.o
+
+tulip-objs := eeprom.o interrupt.o media.o \
+ timer.o tulip_core.o \
+ 21142.o pnic.o pnic2.o
include $(TOPDIR)/Rules.make
+
+# Link rules for multi-part drivers.
+tulip.o: $(tulip-objs)
+ $(LD) -r -o $@ $(tulip-objs)
diff --git a/drivers/net/de2104x.c b/drivers/net/tulip/de2104x.c
index 80dcf338487b..80dcf338487b 100644
--- a/drivers/net/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
diff --git a/drivers/net/de4x5.c b/drivers/net/tulip/de4x5.c
index 8323fcdef499..8323fcdef499 100644
--- a/drivers/net/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
diff --git a/drivers/net/de4x5.h b/drivers/net/tulip/de4x5.h
index dad88edceabd..dad88edceabd 100644
--- a/drivers/net/de4x5.h
+++ b/drivers/net/tulip/de4x5.h
diff --git a/drivers/net/dmfe.c b/drivers/net/tulip/dmfe.c
index df18c0ee97b4..df18c0ee97b4 100644
--- a/drivers/net/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
diff --git a/drivers/net/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 7616fad688ec..7616fad688ec 100644
--- a/drivers/net/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
diff --git a/drivers/net/pcmcia/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index d7af3df7caea..d7af3df7caea 100644
--- a/drivers/net/pcmcia/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
diff --git a/drivers/net/pcmcia/xircom_tulip_cb.c b/drivers/net/tulip/xircom_tulip_cb.c
index 60973d670ce0..60973d670ce0 100644
--- a/drivers/net/pcmcia/xircom_tulip_cb.c
+++ b/drivers/net/tulip/xircom_tulip_cb.c