Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3401299a authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

de6*/dl2k/sundance: Move the D-Link drivers 



Move the D-Link drivers into drivers/net/ethernet/dlink/ and
make the necessary Kconfig and Makefile changes.

CC: Bjorn Ekwall <bj0rn@blox.se>
CC: Donald Becker <becker@scyld.com>
CC: Edward Peng <edward_peng@dlink.com.tw>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a8fe65b8

drivers/net/Kconfig

+0 −64
Original line number Diff line number Diff line
@@ -623,26 +623,6 @@ config SIS900 
	  To compile this driver as a module, choose M here: the module

	  will be called sis900.  This is recommended.



config SUNDANCE

	tristate "Sundance Alta support"

	depends on NET_PCI && PCI

	select CRC32

	select MII

	help

	  This driver is for the Sundance "Alta" chip.

	  More specific information and updates are available from

	  <http://www.scyld.com/network/sundance.html>.



config SUNDANCE_MMIO

	bool "Use MMIO instead of PIO"

	depends on SUNDANCE

	help

	  Enable memory-mapped I/O for interaction with Sundance NIC registers.

	  Do NOT enable this by default, PIO (enabled when MMIO is disabled)

	  is known to solve bugs on certain chips.



	  If unsure, say N.



config TLAN

	tristate "TI ThunderLAN support"

	depends on NET_PCI && (PCI || EISA)
@@ -740,36 +720,6 @@ config NET_POCKET 
	  the questions about this class of network devices. If you say Y, you

	  will be asked for your specific device in the following questions.



config DE600

	tristate "D-Link DE600 pocket adapter support"

	depends on NET_POCKET && PARPORT

	---help---

	  This is a network (Ethernet) device which attaches to your parallel

	  port. Read <file:Documentation/networking/DLINK.txt> as well as the

	  Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>, if you want to use

	  this. It is possible to have several devices share a single parallel

	  port and it is safe to compile the corresponding drivers into the

	  kernel.



	  To compile this driver as a module, choose M here: the module

	  will be called de600.



config DE620

	tristate "D-Link DE620 pocket adapter support"

	depends on NET_POCKET && PARPORT

	---help---

	  This is a network (Ethernet) device which attaches to your parallel

	  port. Read <file:Documentation/networking/DLINK.txt> as well as the

	  Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>, if you want to use

	  this. It is possible to have several devices share a single parallel

	  port and it is safe to compile the corresponding drivers into the

	  kernel.



	  To compile this driver as a module, choose M here: the module

	  will be called de620.



config SGISEEQ

	tristate "SGI Seeq ethernet controller support"

	depends on SGI_HAS_SEEQ
@@ -862,20 +812,6 @@ menuconfig NETDEV_1000 


if NETDEV_1000



config DL2K

	tristate "DL2000/TC902x-based Gigabit Ethernet support"

	depends on PCI

	select CRC32

	help

	  This driver supports DL2000/TC902x-based Gigabit ethernet cards,

	  which includes

	  D-Link DGE-550T Gigabit Ethernet Adapter.

	  D-Link DL2000-based Gigabit Ethernet Adapter.

	  Sundance/Tamarack TC902x Gigabit Ethernet Adapter.



	  To compile this driver as a module, choose M here: the

	  module will be called dl2k.



config IP1000

	tristate "IP1000 Gigabit Ethernet support"

	depends on PCI && EXPERIMENTAL

drivers/net/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o 
# end link order section

#



obj-$(CONFIG_SUNDANCE) += sundance.o

obj-$(CONFIG_HAMACHI) += hamachi.o

obj-$(CONFIG_NET) += Space.o loopback.o

obj-$(CONFIG_SEEQ8005) += seeq8005.o
@@ -106,8 +105,6 @@ obj-$(CONFIG_DUMMY) += dummy.o 
obj-$(CONFIG_IFB) += ifb.o

obj-$(CONFIG_MACVLAN) += macvlan.o

obj-$(CONFIG_MACVTAP) += macvtap.o

obj-$(CONFIG_DE600) += de600.o

obj-$(CONFIG_DE620) += de620.o

obj-$(CONFIG_DEFXX) += defxx.o

obj-$(CONFIG_SGISEEQ) += sgiseeq.o

obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
@@ -123,7 +120,6 @@ obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o 
obj-$(CONFIG_TUN) += tun.o

obj-$(CONFIG_VETH) += veth.o

obj-$(CONFIG_NET_NETX) += netx-eth.o

obj-$(CONFIG_DL2K) += dl2k.o

obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o

obj-$(CONFIG_BFIN_MAC) += bfin_mac.o

obj-$(CONFIG_DM9000) += dm9000.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,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/dlink/Kconfig"

source "drivers/net/ethernet/emulex/Kconfig"

source "drivers/net/ethernet/neterion/Kconfig"

source "drivers/net/ethernet/faraday/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,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_DLINK) += dlink/

obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/

obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/

obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/

drivers/net/ethernet/dlink/Kconfig

0 → 100644
+84 −0
Original line number Diff line number Diff line 
#

# D-Link device configuration

#



config NET_VENDOR_DLINK

	bool "D-Link devices"

	depends on PCI || PARPORT

	---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 D-Link devices. If you say Y, you will be asked for

	  your specific card in the following questions.



if NET_VENDOR_DLINK



config DE600

	tristate "D-Link DE600 pocket adapter support"

	depends on PARPORT

	---help---

	  This is a network (Ethernet) device which attaches to your parallel

	  port. Read <file:Documentation/networking/DLINK.txt> as well as the

	  Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>, if you want to use

	  this. It is possible to have several devices share a single parallel

	  port and it is safe to compile the corresponding drivers into the

	  kernel.



	  To compile this driver as a module, choose M here: the module

	  will be called de600.



config DE620

	tristate "D-Link DE620 pocket adapter support"

	depends on PARPORT

	---help---

	  This is a network (Ethernet) device which attaches to your parallel

	  port. Read <file:Documentation/networking/DLINK.txt> as well as the

	  Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>, if you want to use

	  this. It is possible to have several devices share a single parallel

	  port and it is safe to compile the corresponding drivers into the

	  kernel.



	  To compile this driver as a module, choose M here: the module

	  will be called de620.



config DL2K

	tristate "DL2000/TC902x-based Gigabit Ethernet support"

	depends on PCI

	select CRC32

	---help---

	  This driver supports DL2000/TC902x-based Gigabit ethernet cards,

	  which includes

	  D-Link DGE-550T Gigabit Ethernet Adapter.

	  D-Link DL2000-based Gigabit Ethernet Adapter.

	  Sundance/Tamarack TC902x Gigabit Ethernet Adapter.



	  To compile this driver as a module, choose M here: the

	  module will be called dl2k.



config SUNDANCE

	tristate "Sundance Alta support"

	depends on PCI

	select CRC32

	select MII

	---help---

	  This driver is for the Sundance "Alta" chip.

	  More specific information and updates are available from

	  <http://www.scyld.com/network/sundance.html>.



config SUNDANCE_MMIO

	bool "Use MMIO instead of PIO"

	depends on SUNDANCE

	---help---

	  Enable memory-mapped I/O for interaction with Sundance NIC registers.

	  Do NOT enable this by default, PIO (enabled when MMIO is disabled)

	  is known to solve bugs on certain chips.



	  If unsure, say N.



endif # NET_VENDOR_DLINK