diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-20 23:18:55 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 03:21:51 -0400 |
commit | 527a626601de6ff89859de90883cc546892bf3ca (patch) | |
tree | 5e30febb8d509e036cee5702676f386a0d4e4ad3 /drivers/net/Kconfig | |
parent | 1c1538be1da768fe0209a11e1bdf9dd7ab38905a (diff) |
skge/sky2/mv643xx/pxa168: Move the Marvell Ethernet drivers
Move the Marvell Ethernet drivers into drivers/net/ethernet/marvell/
and make the necessary Kconfig and Makefile changes.
CC: Sachin Sanap <ssanap@marvell.com>
CC: Zhangfei Gao <zgao6@marvell.com>
CC: Philip Rakity <prakity@marvell.com>
CC: Mark Brown <markb@marvell.com>
CC: Lennert Buytenhek <buytenh@marvell.com>
CC: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 87e7a1217851..cb6c6947b320 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -313,16 +313,6 @@ config BFIN_MAC_USE_HWSTAMP | |||
313 | help | 313 | help |
314 | To support the IEEE 1588 Precision Time Protocol (PTP), select y here | 314 | To support the IEEE 1588 Precision Time Protocol (PTP), select y here |
315 | 315 | ||
316 | config PXA168_ETH | ||
317 | tristate "Marvell pxa168 ethernet support" | ||
318 | depends on CPU_PXA168 | ||
319 | select PHYLIB | ||
320 | help | ||
321 | This driver supports the pxa168 Ethernet ports. | ||
322 | |||
323 | To compile this driver as a module, choose M here. The module | ||
324 | will be called pxa168_eth. | ||
325 | |||
326 | config NET_NETX | 316 | config NET_NETX |
327 | tristate "NetX Ethernet support" | 317 | tristate "NetX Ethernet support" |
328 | select MII | 318 | select MII |
@@ -803,73 +793,6 @@ config SIS190 | |||
803 | To compile this driver as a module, choose M here: the module | 793 | To compile this driver as a module, choose M here: the module |
804 | will be called sis190. This is recommended. | 794 | will be called sis190. This is recommended. |
805 | 795 | ||
806 | config SKGE | ||
807 | tristate "Marvell Yukon Gigabit Ethernet support" | ||
808 | depends on PCI | ||
809 | select CRC32 | ||
810 | ---help--- | ||
811 | This driver support the Marvell Yukon or SysKonnect SK-98xx/SK-95xx | ||
812 | and related Gigabit Ethernet adapters. It is a new smaller driver | ||
813 | with better performance and more complete ethtool support. | ||
814 | |||
815 | It does not support the link failover and network management | ||
816 | features that "portable" vendor supplied sk98lin driver does. | ||
817 | |||
818 | This driver supports adapters based on the original Yukon chipset: | ||
819 | Marvell 88E8001, Belkin F5D5005, CNet GigaCard, DLink DGE-530T, | ||
820 | Linksys EG1032/EG1064, 3Com 3C940/3C940B, SysKonnect SK-9871/9872. | ||
821 | |||
822 | It does not support the newer Yukon2 chipset: a separate driver, | ||
823 | sky2, is provided for these adapters. | ||
824 | |||
825 | To compile this driver as a module, choose M here: the module | ||
826 | will be called skge. This is recommended. | ||
827 | |||
828 | config SKGE_DEBUG | ||
829 | bool "Debugging interface" | ||
830 | depends on SKGE && DEBUG_FS | ||
831 | help | ||
832 | This option adds the ability to dump driver state for debugging. | ||
833 | The file /sys/kernel/debug/skge/ethX displays the state of the internal | ||
834 | transmit and receive rings. | ||
835 | |||
836 | If unsure, say N. | ||
837 | |||
838 | config SKGE_GENESIS | ||
839 | bool "Support for older SysKonnect Genesis boards" | ||
840 | depends on SKGE | ||
841 | help | ||
842 | This enables support for the older and uncommon SysKonnect Genesis | ||
843 | chips, which support MII via an external transceiver, instead of | ||
844 | an internal one. Disabling this option will save some memory | ||
845 | by making code smaller. If unsure say Y. | ||
846 | |||
847 | config SKY2 | ||
848 | tristate "Marvell Yukon 2 support" | ||
849 | depends on PCI | ||
850 | select CRC32 | ||
851 | ---help--- | ||
852 | This driver supports Gigabit Ethernet adapters based on the | ||
853 | Marvell Yukon 2 chipset: | ||
854 | Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ | ||
855 | 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 | ||
856 | |||
857 | There is companion driver for the older Marvell Yukon and | ||
858 | SysKonnect Genesis based adapters: skge. | ||
859 | |||
860 | To compile this driver as a module, choose M here: the module | ||
861 | will be called sky2. This is recommended. | ||
862 | |||
863 | config SKY2_DEBUG | ||
864 | bool "Debugging interface" | ||
865 | depends on SKY2 && DEBUG_FS | ||
866 | help | ||
867 | This option adds the ability to dump driver state for debugging. | ||
868 | The file /sys/kernel/debug/sky2/ethX displays the state of the internal | ||
869 | transmit and receive rings. | ||
870 | |||
871 | If unsure, say N. | ||
872 | |||
873 | config VIA_VELOCITY | 796 | config VIA_VELOCITY |
874 | tristate "VIA Velocity support" | 797 | tristate "VIA Velocity support" |
875 | depends on PCI | 798 | depends on PCI |
@@ -952,19 +875,6 @@ config UGETH_TX_ON_DEMAND | |||
952 | bool "Transmit on Demand support" | 875 | bool "Transmit on Demand support" |
953 | depends on UCC_GETH | 876 | depends on UCC_GETH |
954 | 877 | ||
955 | config MV643XX_ETH | ||
956 | tristate "Marvell Discovery (643XX) and Orion ethernet support" | ||
957 | depends on (MV64X60 || PPC32 || PLAT_ORION) && INET | ||
958 | select INET_LRO | ||
959 | select PHYLIB | ||
960 | help | ||
961 | This driver supports the gigabit ethernet MACs in the | ||
962 | Marvell Discovery PPC/MIPS chipset family (MV643XX) and | ||
963 | in the Marvell Orion ARM SoC family. | ||
964 | |||
965 | Some boards that use the Discovery chipset are the Momenco | ||
966 | Ocelot C and Jaguar ATX and Pegasos II. | ||
967 | |||
968 | config XILINX_LL_TEMAC | 878 | config XILINX_LL_TEMAC |
969 | tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" | 879 | tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" |
970 | depends on PPC || MICROBLAZE | 880 | depends on PPC || MICROBLAZE |