Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dnet: Move the Dave Ethernet driver

Move the Dave Ethernet driver into drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.

CC: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

+13 -12
-11
drivers/net/Kconfig
··· 309 309 help 310 310 Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC. 311 311 312 - config DNET 313 - tristate "Dave ethernet support (DNET)" 314 - depends on NET_ETHERNET && HAS_IOMEM 315 - select PHYLIB 316 - help 317 - The Dave ethernet interface (DNET) is found on Qong Board FPGA. 318 - Say Y to include support for the DNET chip. 319 - 320 - To compile this driver as a module, choose M here: the module 321 - will be called dnet. 322 - 323 312 config NET_PCI 324 313 bool "EISA, VLB, PCI and on board controllers" 325 314 depends on ISA || EISA || PCI
-1
drivers/net/Makefile
··· 57 57 obj-$(CONFIG_ETHOC) += ethoc.o 58 58 obj-$(CONFIG_GRETH) += greth.o 59 59 60 - obj-$(CONFIG_DNET) += dnet.o 61 60 obj-$(CONFIG_DEV_APPLETALK) += appletalk/ 62 61 obj-$(CONFIG_ETHERNET) += ethernet/ 63 62 obj-$(CONFIG_TR) += tokenring/
drivers/net/dnet.c drivers/net/ethernet/dnet.c
drivers/net/dnet.h drivers/net/ethernet/dnet.h
+12
drivers/net/ethernet/Kconfig
··· 23 23 source "drivers/net/ethernet/chelsio/Kconfig" 24 24 source "drivers/net/ethernet/cirrus/Kconfig" 25 25 source "drivers/net/ethernet/cisco/Kconfig" 26 + 27 + config DNET 28 + tristate "Dave ethernet support (DNET)" 29 + depends on HAS_IOMEM 30 + select PHYLIB 31 + ---help--- 32 + The Dave ethernet interface (DNET) is found on Qong Board FPGA. 33 + Say Y to include support for the DNET chip. 34 + 35 + To compile this driver as a module, choose M here: the module 36 + will be called dnet. 37 + 26 38 source "drivers/net/ethernet/dec/Kconfig" 27 39 source "drivers/net/ethernet/dlink/Kconfig" 28 40 source "drivers/net/ethernet/emulex/Kconfig"
+1
drivers/net/ethernet/Makefile
··· 15 15 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ 16 16 obj-$(CONFIG_NET_VENDOR_CIRRUS) += cirrus/ 17 17 obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/ 18 + obj-$(CONFIG_DNET) += dnet.o 18 19 obj-$(CONFIG_NET_VENDOR_DEC) += dec/ 19 20 obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/ 20 21 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/