From 38df6492eb511d2a6823303cb1a194c4fe423154 Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Tue, 30 Sep 2014 22:29:46 +0100 Subject: et131x: Add PCIe gigabit ethernet driver et131x to drivers/net This adds the ethernet driver for Agere et131x devices to drivers/net/ethernet. The driver being added has been in the staging tree for some time, and will be removed from there in a seperate patch. This one merely disables the staging version to prevent two instances being built. Signed-off-by: Mark Einon Signed-off-by: David S. Miller --- drivers/net/ethernet/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/net/ethernet/Makefile') diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 153bf2dd9fad..6e0b629e9859 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/ obj-$(CONFIG_GRETH) += aeroflex/ +obj-$(CONFIG_NET_VENDOR_AGERE) += agere/ obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/ obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/ obj-$(CONFIG_ALTERA_TSE) += altera/ -- cgit v1.2.3