lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 30 Jul 2011 20:27:22 -0700 From: Jeff Kirsher <jeffrey.t.kirsher@...el.com> To: davem@...emloft.net Cc: Jeff Kirsher <jeffrey.t.kirsher@...el.com>, netdev@...r.kernel.org, gospo@...hat.com, sassmann@...hat.com, Thierry Reding <thierry.reding@...onic-design.de> Subject: [net-next v2 63/71] 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@...onic-design.de> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com> --- drivers/net/Kconfig | 10 ---------- drivers/net/Makefile | 1 - drivers/net/ethernet/Kconfig | 11 +++++++++++ drivers/net/ethernet/Makefile | 1 + drivers/net/{ => ethernet}/ethoc.c | 0 5 files changed, 12 insertions(+), 11 deletions(-) rename drivers/net/{ => ethernet}/ethoc.c (100%) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 873133e..c77a1b9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 14960d4..4e74d93 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index a911753..e89bb27 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -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" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 5154291..5ef1218 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -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/ diff --git a/drivers/net/ethoc.c b/drivers/net/ethernet/ethoc.c similarity index 100% rename from drivers/net/ethoc.c rename to drivers/net/ethernet/ethoc.c -- 1.7.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists