Commit a88394cf authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarGrant Grundler <grundler@parisc-linux.org>
parent 5ff2241d

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -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>

drivers/net/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -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

drivers/net/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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/

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

CRA Git | Maintained and supported by SUSTech CRA and CCSE