1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 93359fab240e..4d68a264df9b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2115,7 +2115,6 @@ config E1000
 
 config E1000E
         tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
-        select CRC32
         depends on PCI && (!SPARC32 || BROKEN)
         select CRC32
         ---help---
@@ -2197,15 +2196,6 @@ config IGBVF
 
 source "drivers/net/ixp2000/Kconfig"
 
-config MYRI_SBUS
-        tristate "MyriCOM Gigabit Ethernet support"
-        depends on SBUS
-        help
-          This driver supports MyriCOM Sbus gigabit Ethernet cards.
-
-          To compile this driver as a module, choose M here: the module
-          will be called myri_sbus.  This is recommended.
-
 config NS83820
         tristate "National Semiconductor DP83820 support"
         depends on PCI
@@ -2561,6 +2551,15 @@ config PCH_GBE
           ML7223 is companion chip for Intel Atom E6xx series.
           ML7223 is completely compatible for Intel EG20T PCH.
 
+config FTGMAC100
+        tristate "Faraday FTGMAC100 Gigabit Ethernet support"
+        depends on ARM
+        select PHYLIB
+        help
+          This driver supports the FTGMAC100 Gigabit Ethernet controller
+          from Faraday. It is used on Faraday A369, Andes AG102 and some
+          other ARM/NDS32 SoC's.
+
 endif # NETDEV_1000
 
 #