summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/Makefile
diff options
context:
space:
mode:
authorMark Einon <mark.einon@gmail.com>2014-10-01 01:29:46 +0400
committerDavid S. Miller <davem@davemloft.net>2014-10-03 23:22:19 +0400
commit38df6492eb511d2a6823303cb1a194c4fe423154 (patch)
tree178f95aa9898127f5dc16a9635db59dfe558a5e6 /drivers/net/ethernet/Makefile
parent739e4a758e0e2930f4bcdddd244254bae8dd7499 (diff)
downloadlinux-38df6492eb511d2a6823303cb1a194c4fe423154.tar.xz
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 <mark.einon@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/Makefile')
-rw-r--r--drivers/net/ethernet/Makefile1
1 files changed, 1 insertions, 0 deletions
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/