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

diff --combined drivers/net/Kconfig
index d7a33d6,c5e2b16..d49bf57
--- 1/drivers/net/Kconfig
--- 2/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@@ -123,6 -123,6 +123,11 @@@ config FEC_MX
          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
@@@ -225,12 -225,9 +230,12 @@@ config GMAC_ROCKCHI
          This driver provides Rockchip SoCs network support based on the
          Synopsys Designware driver.
  
 -config FTMAC100
 -      bool "Ftmac100 Ethernet Support"
 +config RENESAS_RAVB
 +      bool "Renesas Ethernet AVB MAC"
 +      depends on DM_ETH && RCAR_GEN3
 +      select PHYLIB
        help
 -        This MAC is present in Andestech SoCs.
 +        This driver implements support for the Ethernet AVB block in
 +        Renesas M3 and H3 SoCs.
  
  endif # NETDEVICES