From: Tom Rini <trini@konsulko.com>
Date: Fri, 26 May 2017 15:18:53 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-nds32
X-Git-Tag: v2017.07-rc1~190
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6;p=platform%2Fkernel%2Fu-boot.git

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
---

8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6
diff --cc drivers/net/Kconfig
index d7a33d6,c5e2b16..d49bf57
--- a/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