ewrk3/tulip: Move the DEC - Tulip drivers
Move the DEC - Tulip driver into drivers/net/ethernet/dec/tulip/ and make the necessary Kconfig and Makefile changes. The Digital Equioment (DEC) driver ewrk3 was moved into drivers/net/ethernet/dec/ and the remaining drivers (Tulip) were moved into drivers/net/ethernet/dec/tulip/ CC: Tobias Ringstrom <tori@unhappy.mine.nu> CC: Grant Grundler <grundler@parisc-linux.org> CC: David Davies <davies@maniac.ultranet.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Grant Grundler <grundler@parisc-linux.org>
This commit is contained in:
parent
5ff2241dd4
commit
a88394cfb5
|
@ -2073,7 +2073,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
|
|||
L: netdev@vger.kernel.org
|
||||
S: Orphan
|
||||
F: Documentation/networking/dmfe.txt
|
||||
F: drivers/net/tulip/dmfe.c
|
||||
F: drivers/net/ethernet/tulip/dmfe.c
|
||||
|
||||
DC390/AM53C974 SCSI driver
|
||||
M: Kurt Garloff <garloff@suse.de>
|
||||
|
@ -6514,7 +6514,7 @@ TULIP NETWORK DRIVERS
|
|||
M: Grant Grundler <grundler@parisc-linux.org>
|
||||
L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/net/tulip/
|
||||
F: drivers/net/ethernet/tulip/
|
||||
|
||||
TUN/TAP driver
|
||||
M: Maxim Krasnyansky <maxk@qualcomm.com>
|
||||
|
|
|
@ -452,8 +452,6 @@ config DNET
|
|||
To compile this driver as a module, choose M here: the module
|
||||
will be called dnet.
|
||||
|
||||
source "drivers/net/tulip/Kconfig"
|
||||
|
||||
config AT1700
|
||||
tristate "AT1700/1720 support (EXPERIMENTAL)"
|
||||
depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
|
||||
|
@ -494,20 +492,6 @@ config NET_ISA
|
|||
the remaining ISA network card questions. If you say Y, you will be
|
||||
asked for your specific card in the following questions.
|
||||
|
||||
config EWRK3
|
||||
tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
|
||||
depends on NET_ISA
|
||||
select CRC32
|
||||
---help---
|
||||
This driver supports the DE203, DE204 and DE205 network (Ethernet)
|
||||
cards. If this is for you, say Y and read
|
||||
<file:Documentation/networking/ewrk3.txt> in the kernel source as
|
||||
well as the Ethernet-HOWTO, available from
|
||||
<http://www.tldp.org/docs.html#howto>.
|
||||
|
||||
To compile this driver as a module, choose M here. The module
|
||||
will be called ewrk3.
|
||||
|
||||
config ETH16I
|
||||
tristate "ICL EtherTeam 16i/32 support"
|
||||
depends on NET_ISA
|
||||
|
|
|
@ -106,7 +106,6 @@ obj-$(CONFIG_SGISEEQ) += sgiseeq.o
|
|||
obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
|
||||
obj-$(CONFIG_AT1700) += at1700.o
|
||||
obj-$(CONFIG_CPMAC) += cpmac.o
|
||||
obj-$(CONFIG_EWRK3) += ewrk3.o
|
||||
|
||||
obj-$(CONFIG_ETH16I) += eth16i.o
|
||||
obj-$(CONFIG_EQUALIZER) += eql.o
|
||||
|
@ -147,7 +146,6 @@ obj-$(CONFIG_USB_IPHETH) += usb/
|
|||
obj-$(CONFIG_USB_CDC_PHONET) += usb/
|
||||
|
||||
obj-$(CONFIG_WLAN) += wireless/
|
||||
obj-$(CONFIG_NET_TULIP) += tulip/
|
||||
obj-$(CONFIG_HAMRADIO) += hamradio/
|
||||
obj-$(CONFIG_IRDA) += irda/
|
||||
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
|
||||
|
|
|
@ -19,6 +19,7 @@ source "drivers/net/ethernet/broadcom/Kconfig"
|
|||
source "drivers/net/ethernet/brocade/Kconfig"
|
||||
source "drivers/net/ethernet/chelsio/Kconfig"
|
||||
source "drivers/net/ethernet/cisco/Kconfig"
|
||||
source "drivers/net/ethernet/dec/Kconfig"
|
||||
source "drivers/net/ethernet/dlink/Kconfig"
|
||||
source "drivers/net/ethernet/emulex/Kconfig"
|
||||
source "drivers/net/ethernet/neterion/Kconfig"
|
||||
|
|
|
@ -11,6 +11,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
|
|||
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
|
||||
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
|
||||
obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
|
||||
obj-$(CONFIG_NET_VENDOR_DEC) += dec/
|
||||
obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
|
||||
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
|
||||
obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
|
||||
|
|
36
drivers/net/ethernet/dec/Kconfig
Normal file
36
drivers/net/ethernet/dec/Kconfig
Normal file
|
@ -0,0 +1,36 @@
|
|||
#
|
||||
# Digital Equipment Inc network device configuration
|
||||
#
|
||||
|
||||
config NET_VENDOR_DEC
|
||||
bool "Digital Equipment devices"
|
||||
depends on PCI || EISA || CARDBUS
|
||||
---help---
|
||||
If you have a network (Ethernet) card belonging to this class, say Y
|
||||
and read the Ethernet-HOWTO, available from
|
||||
<http://www.tldp.org/docs.html#howto>.
|
||||
|
||||
Note that the answer to this question doesn't directly affect the
|
||||
kernel: saying N will just cause the configurator to skip all
|
||||
the questions about DEC cards. If you say Y, you will be asked for
|
||||
your specific card in the following questions.
|
||||
|
||||
if NET_VENDOR_DEC
|
||||
|
||||
config EWRK3
|
||||
tristate "EtherWORKS 3 (DE203, DE204, DE205) support"
|
||||
depends on ISA
|
||||
select CRC32
|
||||
---help---
|
||||
This driver supports the DE203, DE204 and DE205 network (Ethernet)
|
||||
cards. If this is for you, say Y and read
|
||||
<file:Documentation/networking/ewrk3.txt> in the kernel source as
|
||||
well as the Ethernet-HOWTO, available from
|
||||
<http://www.tldp.org/docs.html#howto>.
|
||||
|
||||
To compile this driver as a module, choose M here. The module
|
||||
will be called ewrk3.
|
||||
|
||||
source "drivers/net/ethernet/dec/tulip/Kconfig"
|
||||
|
||||
endif # NET_VENDOR_DEC
|
6
drivers/net/ethernet/dec/Makefile
Normal file
6
drivers/net/ethernet/dec/Makefile
Normal file
|
@ -0,0 +1,6 @@
|
|||
#
|
||||
# Makefile for the Digital Equipment Inc. network device drivers.
|
||||
#
|
||||
|
||||
obj-$(CONFIG_EWRK3) += ewrk3.o
|
||||
obj-$(CONFIG_NET_TULIP) += tulip/
|
|
@ -2,10 +2,10 @@
|
|||
# Tulip family network device configuration
|
||||
#
|
||||
|
||||
menuconfig NET_TULIP
|
||||
bool "\"Tulip\" family network device support"
|
||||
depends on PCI || EISA || CARDBUS
|
||||
help
|
||||
config NET_TULIP
|
||||
bool "DEC - Tulip devices"
|
||||
depends on (PCI || EISA || CARDBUS)
|
||||
---help---
|
||||
This selects the "Tulip" family of EISA/PCI network cards.
|
||||
|
||||
if NET_TULIP
|
||||
|
@ -32,7 +32,7 @@ config DE2104X_DSL
|
|||
depends on DE2104X
|
||||
range 0 31
|
||||
default 0
|
||||
help
|
||||
---help---
|
||||
Setting this value allows to align ring buffer descriptors into their
|
||||
own cache lines. Value of 4 corresponds to the typical 32 byte line
|
||||
(the descriptor is 16 bytes). This is necessary on systems that lack
|
||||
|
@ -59,7 +59,7 @@ config TULIP
|
|||
config TULIP_MWI
|
||||
bool "New bus configuration (EXPERIMENTAL)"
|
||||
depends on TULIP && EXPERIMENTAL
|
||||
help
|
||||
---help---
|
||||
This configures your Tulip card specifically for the card and
|
||||
system cache line size type you are using.
|
||||
|
||||
|
@ -70,7 +70,7 @@ config TULIP_MWI
|
|||
config TULIP_MMIO
|
||||
bool "Use PCI shared mem for NIC registers"
|
||||
depends on TULIP
|
||||
help
|
||||
---help---
|
||||
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.
|
||||
|
@ -79,7 +79,7 @@ config TULIP_MMIO
|
|||
config TULIP_NAPI
|
||||
bool "Use RX polling (NAPI)"
|
||||
depends on TULIP
|
||||
help
|
||||
---help---
|
||||
NAPI is a new driver API designed to reduce CPU and interrupt load
|
||||
when the driver is receiving lots of packets from the card. It is
|
||||
still somewhat experimental and thus not yet enabled by default.
|
||||
|
@ -107,7 +107,7 @@ config TULIP_DM910X
|
|||
|
||||
config DE4X5
|
||||
tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
|
||||
depends on PCI || EISA
|
||||
depends on (PCI || EISA)
|
||||
select CRC32
|
||||
---help---
|
||||
This is support for the DIGITAL series of PCI/EISA Ethernet cards.
|
||||
|
@ -126,7 +126,7 @@ config WINBOND_840
|
|||
depends on PCI
|
||||
select CRC32
|
||||
select MII
|
||||
help
|
||||
---help---
|
||||
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
|
Loading…
Reference in a new issue