diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-26 15:18:53 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-26 15:18:53 (GMT) |
| commit | 8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6 (patch) | |
| tree | b4566d2d99140d4180efc2ca9f32b2ddf3e310a8 /drivers/net/Kconfig | |
| parent | be62fbf376261ab3a4ed5db3bf54d5df9e216d9f (diff) | |
| parent | be71a179bdd935336fb0bee8283be729144ac965 (diff) | |
| download | u-boot-8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-nds32
Move FTMAC100 to where it should be, alphabetically in
drivers/net/Kconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d7a33d6..d49bf57 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -123,6 +123,11 @@ config FEC_MXC This driver supports the 10/100 Fast Ethernet controller for NXP i.MX processors. +config FTMAC100 + bool "Ftmac100 Ethernet Support" + help + This MAC is present in Andestech SoCs. + config MVPP2 bool "Marvell Armada 375/7K/8K network interface support" depends on ARMADA_375 || ARMADA_8K |