From 009fb0978ca4b5362cf875869c42893cc43b71a1 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 8 Mar 2016 11:29:56 +0100 Subject: net-next: mediatek: add Kconfig and Makefile This patch adds the Makefile and Kconfig required to make the driver build. Signed-off-by: John Crispin Signed-off-by: David S. Miller --- drivers/net/ethernet/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/net/ethernet/Kconfig') diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 0b13af8e4070..be67a19e01b9 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -106,6 +106,7 @@ config LANTIQ_ETOP Support for the MII0 inside the Lantiq SoC source "drivers/net/ethernet/marvell/Kconfig" +source "drivers/net/ethernet/mediatek/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" source "drivers/net/ethernet/micrel/Kconfig" source "drivers/net/ethernet/microchip/Kconfig" -- cgit v1.2.3 From d07a147f00de303c799af3427d4e2d612902a7d3 Mon Sep 17 00:00:00 2001 From: David Daney Date: Mon, 14 Mar 2016 17:57:08 -0700 Subject: netdev: Move octeon/octeon_mgmt driver to cavium directory. No code changes. Since OCTEON is a Cavium product, move the driver to the vendor directory to unclutter things a bit. Signed-off-by: David Daney Signed-off-by: David S. Miller --- drivers/net/ethernet/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/net/ethernet/Kconfig') diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index be67a19e01b9..2ffd63463299 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -139,7 +139,6 @@ config NET_NETX source "drivers/net/ethernet/nuvoton/Kconfig" source "drivers/net/ethernet/nvidia/Kconfig" source "drivers/net/ethernet/nxp/Kconfig" -source "drivers/net/ethernet/octeon/Kconfig" source "drivers/net/ethernet/oki-semi/Kconfig" config ETHOC -- cgit v1.2.3