aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid VomLehn <vomlehn@texas.net>2017-01-24 01:09:20 -0500
committerDavid S. Miller <davem@davemloft.net>2017-01-24 15:03:41 -0500
commitaa13f7cedd9f2813acb83db98bbd3041dfa1e8fa (patch)
tree75b4a0ca0bbc05975364b7b78e8072c6cb4bfdbb
parentee6d6d0055449c6d9d5fcce6e72614d6eaa18c01 (diff)
net: ethernet: aquantia: Integrate AQtion 2.5/5 GB NIC driver
Modify the drivers/net/ethernet/{Makefile,Kconfig} file to make them a part of the network drivers build. Signed-off-by: Alexander Loktionov <Alexander.Loktionov@aquantia.com> Signed-off-by: Dmitrii Tarakanov <Dmitrii.Tarakanov@aquantia.com> Signed-off-by: Pavel Belous <Pavel.Belous@aquantia.com> Signed-off-by: Dmitry Bezrukov <Dmitry.Bezrukov@aquantia.com> Signed-off-by: David M. VomLehn <vomlehn@texas.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/Kconfig1
-rw-r--r--drivers/net/ethernet/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index afc07d4434bb..8c08f9deef92 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -29,6 +29,7 @@ source "drivers/net/ethernet/amazon/Kconfig"
29source "drivers/net/ethernet/amd/Kconfig" 29source "drivers/net/ethernet/amd/Kconfig"
30source "drivers/net/ethernet/apm/Kconfig" 30source "drivers/net/ethernet/apm/Kconfig"
31source "drivers/net/ethernet/apple/Kconfig" 31source "drivers/net/ethernet/apple/Kconfig"
32source "drivers/net/ethernet/aquantia/Kconfig"
32source "drivers/net/ethernet/arc/Kconfig" 33source "drivers/net/ethernet/arc/Kconfig"
33source "drivers/net/ethernet/atheros/Kconfig" 34source "drivers/net/ethernet/atheros/Kconfig"
34source "drivers/net/ethernet/aurora/Kconfig" 35source "drivers/net/ethernet/aurora/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e7861a8aa817..26dce5bf2c18 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_VENDOR_AMAZON) += amazon/
15obj-$(CONFIG_NET_VENDOR_AMD) += amd/ 15obj-$(CONFIG_NET_VENDOR_AMD) += amd/
16obj-$(CONFIG_NET_XGENE) += apm/ 16obj-$(CONFIG_NET_XGENE) += apm/
17obj-$(CONFIG_NET_VENDOR_APPLE) += apple/ 17obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
18obj-$(CONFIG_NET_VENDOR_AQUANTIA) += aquantia/
18obj-$(CONFIG_NET_VENDOR_ARC) += arc/ 19obj-$(CONFIG_NET_VENDOR_ARC) += arc/
19obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/ 20obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
20obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/ 21obj-$(CONFIG_NET_VENDOR_AURORA) += aurora/