diff options
| author | Mark Einon <mark.einon@gmail.com> | 2014-09-30 17:29:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-03 15:22:19 -0400 |
| commit | 38df6492eb511d2a6823303cb1a194c4fe423154 (patch) | |
| tree | 178f95aa9898127f5dc16a9635db59dfe558a5e6 /drivers/net/ethernet/Kconfig | |
| parent | 739e4a758e0e2930f4bcdddd244254bae8dd7499 (diff) | |
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/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 0005e3792e6d..1ed1fbba5d58 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig | |||
| @@ -20,6 +20,7 @@ config SUNGEM_PHY | |||
| 20 | source "drivers/net/ethernet/3com/Kconfig" | 20 | source "drivers/net/ethernet/3com/Kconfig" |
| 21 | source "drivers/net/ethernet/adaptec/Kconfig" | 21 | source "drivers/net/ethernet/adaptec/Kconfig" |
| 22 | source "drivers/net/ethernet/aeroflex/Kconfig" | 22 | source "drivers/net/ethernet/aeroflex/Kconfig" |
| 23 | source "drivers/net/ethernet/agere/Kconfig" | ||
| 23 | source "drivers/net/ethernet/allwinner/Kconfig" | 24 | source "drivers/net/ethernet/allwinner/Kconfig" |
| 24 | source "drivers/net/ethernet/alteon/Kconfig" | 25 | source "drivers/net/ethernet/alteon/Kconfig" |
| 25 | source "drivers/net/ethernet/altera/Kconfig" | 26 | source "drivers/net/ethernet/altera/Kconfig" |