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

Commit 4ee54299 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

ethoc: Move the Avionic driver 



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

CC: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9c8571da

drivers/net/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -291,16 +291,6 @@ config ENC28J60_WRITEVERIFY 
	  Enable the verify after the buffer write useful for debugging purpose.

	  If unsure, say N.



config ETHOC

	tristate "OpenCores 10/100 Mbps Ethernet MAC support"

	depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA

	select MII

	select PHYLIB

	select CRC32

	select BITREVERSE

	help

	  Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.



config GRETH

	tristate "Aeroflex Gaisler GRETH Ethernet MAC support"

	depends on SPARC

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ obj-$(CONFIG_VETH) += veth.o 
obj-$(CONFIG_NET_NETX) += netx-eth.o

obj-$(CONFIG_DM9000) += dm9000.o

obj-$(CONFIG_ENC28J60) += enc28j60.o

obj-$(CONFIG_ETHOC) += ethoc.o

obj-$(CONFIG_GRETH) += greth.o



obj-$(CONFIG_DEV_APPLETALK) += appletalk/

drivers/net/ethernet/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -103,6 +103,17 @@ source "drivers/net/ethernet/nuvoton/Kconfig" 
source "drivers/net/ethernet/nvidia/Kconfig"

source "drivers/net/ethernet/octeon/Kconfig"

source "drivers/net/ethernet/oki-semi/Kconfig"



config ETHOC

	tristate "OpenCores 10/100 Mbps Ethernet MAC support"

	depends on HAS_IOMEM && HAS_DMA

	select MII

	select PHYLIB

	select CRC32

	select BITREVERSE

	---help---

	  Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.



source "drivers/net/ethernet/packetengines/Kconfig"

source "drivers/net/ethernet/pasemi/Kconfig"

source "drivers/net/ethernet/qlogic/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/ 
obj-$(CONFIG_NET_VENDOR_NVIDIA) += nvidia/

obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/

obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/

obj-$(CONFIG_ETHOC) += ethoc.o

obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/

obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

drivers/net/ethoc.c→drivers/net/ethernet/ethoc.c

+0 −0

File moved.

View file