skge/sky2/mv643xx/pxa168: Move the Marvell Ethernet drivers

[linux-2.6-block.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 87e7a1217851c1525fbb54e5bc10dbda649b6e56..cb6c6947b3200ad6e79093a0bfc23aba52042c3d 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -313,16 +313,6 @@ config BFIN_MAC_USE_HWSTAMP
        help
          To support the IEEE 1588 Precision Time Protocol (PTP), select y here
 
-config PXA168_ETH
-       tristate "Marvell pxa168 ethernet support"
-       depends on CPU_PXA168
-       select PHYLIB
-       help
-         This driver supports the pxa168 Ethernet ports.
-
-         To compile this driver as a module, choose M here. The module
-         will be called pxa168_eth.
-
 config NET_NETX
        tristate "NetX Ethernet support"
        select MII
@@ -803,73 +793,6 @@ config SIS190
          To compile this driver as a module, choose M here: the module
          will be called sis190.  This is recommended.
 
-config SKGE
-       tristate "Marvell Yukon Gigabit Ethernet support"
-       depends on PCI
-       select CRC32
-       ---help---
-         This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx
-         and related Gigabit Ethernet adapters. It is a new smaller driver
-         with better performance and more complete ethtool support.
-
-         It does not support the link failover and network management 
-         features that "portable" vendor supplied sk98lin driver does.
-
-         This driver supports adapters based on the original Yukon chipset:
-         Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T,
-         Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872.
-
-         It does not support the newer Yukon2 chipset: a separate driver,
-         sky2, is provided for these adapters.
-
-         To compile this driver as a module, choose M here: the module
-         will be called skge.  This is recommended.
-
-config SKGE_DEBUG
-       bool "Debugging interface"
-       depends on SKGE && DEBUG_FS
-       help
-         This option adds the ability to dump driver state for debugging.
-         The file /sys/kernel/debug/skge/ethX displays the state of the internal
-         transmit and receive rings.
-
-         If unsure, say N.
-
-config SKGE_GENESIS
-       bool "Support for older SysKonnect Genesis boards"
-       depends on SKGE
-       help
-         This enables support for the older and uncommon SysKonnect Genesis
-        chips, which support MII via an external transceiver, instead of
-        an internal one. Disabling this option will save some memory
-        by making code smaller. If unsure say Y.
-
-config SKY2
-       tristate "Marvell Yukon 2 support"
-       depends on PCI
-       select CRC32
-       ---help---
-         This driver supports Gigabit Ethernet adapters based on the
-         Marvell Yukon 2 chipset:
-         Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
-         88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
-
-         There is companion driver for the older Marvell Yukon and
-         SysKonnect Genesis based adapters: skge.
-
-         To compile this driver as a module, choose M here: the module
-         will be called sky2.  This is recommended.
-
-config SKY2_DEBUG
-       bool "Debugging interface"
-       depends on SKY2 && DEBUG_FS
-       help
-         This option adds the ability to dump driver state for debugging.
-         The file /sys/kernel/debug/sky2/ethX displays the state of the internal
-         transmit and receive rings.
-
-         If unsure, say N.
-
 config VIA_VELOCITY
        tristate "VIA Velocity support"
        depends on PCI
@@ -952,19 +875,6 @@ config UGETH_TX_ON_DEMAND
        bool "Transmit on Demand support"
        depends on UCC_GETH
 
-config MV643XX_ETH
-       tristate "Marvell Discovery (643XX) and Orion ethernet support"
-       depends on (MV64X60 || PPC32 || PLAT_ORION) && INET
-       select INET_LRO
-       select PHYLIB
-       help
-         This driver supports the gigabit ethernet MACs in the
-         Marvell Discovery PPC/MIPS chipset family (MV643XX) and
-         in the Marvell Orion ARM SoC family.
-
-         Some boards that use the Discovery chipset are the Momenco
-         Ocelot C and Jaguar ATX and Pegasos II.
-
 config XILINX_LL_TEMAC
        tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
        depends on PPC || MICROBLAZE