stmmac: Move the STMicroelectronics driver

[deliverable/linux.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 08ce280410634a13d0a29de10389a3f9092beeac..a7ec50f197fc0be64157aafaccb481b404a63689 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1406,8 +1406,6 @@ config S6GMAC
          To compile this driver as a module, choose M here. The module
          will be called s6gmac.
 
-source "drivers/net/stmmac/Kconfig"
-
 config PCH_GBE
        tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE"
        depends on PCI
@@ -1457,21 +1455,6 @@ if NETDEV_10000
 config MDIO
        tristate
 
-config PASEMI_MAC
-       tristate "PA Semi 1/10Gbit MAC"
-       depends on PPC_PASEMI && PCI && INET
-       select PHYLIB
-       select INET_LRO
-       help
-         This driver supports the on-chip 1/10Gbit Ethernet controller on
-         PA Semi's PWRficient line of chips.
-
-config TEHUTI
-       tristate "Tehuti Networks 10G Ethernet"
-       depends on PCI
-       help
-         Tehuti Networks 10G Ethernet NIC
-
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"