From 3401299a1b9e747cbf7de2cc0c8f6376c3cbe565 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 20 May 2011 00:04:35 -0700 Subject: [PATCH] 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 CC: Donald Becker CC: Edward Peng Signed-off-by: Jeff Kirsher --- drivers/net/Kconfig | 64 ---------------- drivers/net/Makefile | 4 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/dlink/Kconfig | 84 +++++++++++++++++++++ drivers/net/ethernet/dlink/Makefile | 8 ++ drivers/net/{ => ethernet/dlink}/de600.c | 0 drivers/net/{ => ethernet/dlink}/de600.h | 0 drivers/net/{ => ethernet/dlink}/de620.c | 0 drivers/net/{ => ethernet/dlink}/de620.h | 0 drivers/net/{ => ethernet/dlink}/dl2k.c | 0 drivers/net/{ => ethernet/dlink}/dl2k.h | 0 drivers/net/{ => ethernet/dlink}/sundance.c | 0 13 files changed, 94 insertions(+), 68 deletions(-) create mode 100644 drivers/net/ethernet/dlink/Kconfig create mode 100644 drivers/net/ethernet/dlink/Makefile rename drivers/net/{ => ethernet/dlink}/de600.c (100%) rename drivers/net/{ => ethernet/dlink}/de600.h (100%) rename drivers/net/{ => ethernet/dlink}/de620.c (100%) rename drivers/net/{ => ethernet/dlink}/de620.h (100%) rename drivers/net/{ => ethernet/dlink}/dl2k.c (100%) rename drivers/net/{ => ethernet/dlink}/dl2k.h (100%) rename drivers/net/{ => ethernet/dlink}/sundance.c (100%) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 42408d7dc1c2..8799caf64c98 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -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 - . - -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 as well as the - Ethernet-HOWTO, available from - , 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 as well as the - Ethernet-HOWTO, available from - , 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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index d142fc5ef68c..ecd8c9f664d2 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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 diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index fecac79b009b..8007e20972e4 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -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" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 0092c30db18f..22ef3808f439 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -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/ diff --git a/drivers/net/ethernet/dlink/Kconfig b/drivers/net/ethernet/dlink/Kconfig new file mode 100644 index 000000000000..9fdb66b66f15 --- /dev/null +++ b/drivers/net/ethernet/dlink/Kconfig @@ -0,0 +1,84 @@ +# +# 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 + . + + 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 as well as the + Ethernet-HOWTO, available from + , 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 as well as the + Ethernet-HOWTO, available from + , 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 + . + +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 diff --git a/drivers/net/ethernet/dlink/Makefile b/drivers/net/ethernet/dlink/Makefile new file mode 100644 index 000000000000..c705eaa4f5b2 --- /dev/null +++ b/drivers/net/ethernet/dlink/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for the D-Link network device drivers. +# + +obj-$(CONFIG_DE600) += de600.o +obj-$(CONFIG_DE620) += de620.o +obj-$(CONFIG_DL2K) += dl2k.o +obj-$(CONFIG_SUNDANCE) += sundance.o diff --git a/drivers/net/de600.c b/drivers/net/ethernet/dlink/de600.c similarity index 100% rename from drivers/net/de600.c rename to drivers/net/ethernet/dlink/de600.c diff --git a/drivers/net/de600.h b/drivers/net/ethernet/dlink/de600.h similarity index 100% rename from drivers/net/de600.h rename to drivers/net/ethernet/dlink/de600.h diff --git a/drivers/net/de620.c b/drivers/net/ethernet/dlink/de620.c similarity index 100% rename from drivers/net/de620.c rename to drivers/net/ethernet/dlink/de620.c diff --git a/drivers/net/de620.h b/drivers/net/ethernet/dlink/de620.h similarity index 100% rename from drivers/net/de620.h rename to drivers/net/ethernet/dlink/de620.h diff --git a/drivers/net/dl2k.c b/drivers/net/ethernet/dlink/dl2k.c similarity index 100% rename from drivers/net/dl2k.c rename to drivers/net/ethernet/dlink/dl2k.c diff --git a/drivers/net/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h similarity index 100% rename from drivers/net/dl2k.h rename to drivers/net/ethernet/dlink/dl2k.h diff --git a/drivers/net/sundance.c b/drivers/net/ethernet/dlink/sundance.c similarity index 100% rename from drivers/net/sundance.c rename to drivers/net/ethernet/dlink/sundance.c -- 2.30.2