From 115978859272b958366d4a08c99a24f9625fa663 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Wed, 13 Jul 2011 15:38:08 -0700 Subject: i825xx: Move the Intel 82586/82593/82596 based drivers Move the drivers that use the i82586/i82593/i82596 chipsets into drivers/net/ethernet/i825xx/ and make the necessary Kconfig and Makefile changes. There were 4 3Com drivers which were initially moved into 3com/, which now reside in i825xx since they all used the i82586 chip. CC: Philip Blundell CC: Russell King CC: CC: Donald Becker CC: Chris Beauregard CC: Richard Procter CC: Andries Brouwer CC: "M.Hipp" CC: Richard Hirst CC: Sam Creasey CC: Thomas Bogendoerfer Signed-off-by: Jeff Kirsher --- drivers/net/Kconfig | 167 +--------------------------------------------------- 1 file changed, 1 insertion(+), 166 deletions(-) (limited to 'drivers/net/Kconfig') diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 6499186..d7d0b35 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -306,47 +306,6 @@ config MACMACE say Y and read the Ethernet-HOWTO, available from . -config MVME16x_NET - tristate "MVME16x Ethernet support" - depends on MVME16x - help - This is the driver for the Ethernet interface on the Motorola - MVME162, 166, 167, 172 and 177 boards. Say Y here to include the - driver for this chip in your kernel. - To compile this driver as a module, choose M here. - -config BVME6000_NET - tristate "BVME6000 Ethernet support" - depends on BVME6000 - help - This is the driver for the Ethernet interface on BVME4000 and - BVME6000 VME boards. Say Y here to include the driver for this chip - in your kernel. - To compile this driver as a module, choose M here. - -config SUN3_82586 - bool "Sun3 on-board Intel 82586 support" - depends on SUN3 - help - This driver enables support for the on-board Intel 82586 based - Ethernet adapter found on Sun 3/1xx and 3/2xx motherboards. Note - that this driver does not support 82586-based adapters on additional - VME boards. - -config LASI_82596 - tristate "Lasi ethernet" - depends on GSC - help - Say Y here to support the builtin Intel 82596 ethernet controller - found in Hewlett-Packard PA-RISC machines with 10Mbit ethernet. - -config SNI_82596 - tristate "SNI RM ethernet" - depends on NET_ETHERNET && SNI_RM - help - Say Y here to support the on-board Intel 82596 ethernet controller - built into SNI RM machines. - config KORINA tristate "Korina (IDT RC32434) Ethernet support" depends on NET_ETHERNET && MIKROTIK_RB532 @@ -462,63 +421,6 @@ config SUNVNET help Support for virtual network devices under Sun Logical Domains. -config EL2 - tristate "3c503 \"EtherLink II\" support" - depends on ISA - select CRC32 - ---help--- - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called 3c503. - -config ELPLUS - tristate "3c505 \"EtherLink Plus\" support" - depends on ISA && ISA_DMA_API - ---help--- - Information about this network (Ethernet) card can be found in - . If you have a card of - this type, say Y and read the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called 3c505. - -config EL16 - tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)" - depends on ISA && EXPERIMENTAL - ---help--- - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called 3c507. - -config ELMC - tristate "3c523 \"EtherLink/MC\" support" - depends on MCA_LEGACY - ---help--- - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called 3c523. - -config ELMC_II - tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)" - depends on MCA && MCA_LEGACY - ---help--- - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called 3c527. - config BFIN_MAC tristate "Blackfin on-chip MAC support" depends on NET_ETHERNET && (BF516 || BF518 || BF526 || BF527 || BF536 || BF537) @@ -684,7 +586,7 @@ config NET_VENDOR_RACAL depends on ISA help If you have a network (Ethernet) card belonging to this class, such - as the NI5010, NI5210 or NI6210, say Y and read the Ethernet-HOWTO, + as the NI5010, say Y and read the Ethernet-HOWTO, available from . Note that the answer to this question doesn't directly affect the @@ -704,17 +606,6 @@ config NI5010 To compile this driver as a module, choose M here. The module will be called ni5010. -config NI52 - tristate "NI5210 support" - depends on NET_VENDOR_RACAL && ISA - help - If you have a network (Ethernet) card of this type, say Y and read - the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called ni52. - config DNET tristate "Dave ethernet support (DNET)" depends on NET_ETHERNET && HAS_IOMEM @@ -782,41 +673,6 @@ config EWRK3 To compile this driver as a module, choose M here. The module will be called ewrk3. -config EEXPRESS - tristate "EtherExpress 16 support" - depends on NET_ISA - ---help--- - If you have an EtherExpress16 network (Ethernet) card, say Y and - read the Ethernet-HOWTO, available from - . Note that the Intel - EtherExpress16 card used to be regarded as a very poor choice - because the driver was very unreliable. We now have a new driver - that should do better. - - To compile this driver as a module, choose M here. The module - will be called eexpress. - -config EEXPRESS_PRO - tristate "EtherExpressPro support/EtherExpress 10 (i82595) support" - depends on NET_ISA - ---help--- - If you have a network (Ethernet) card of this type, say Y. This - driver supports Intel i82595{FX,TX} based boards. Note however - that the EtherExpress PRO/100 Ethernet card has its own separate - driver. Please read the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called eepro. - -config LP486E - tristate "LP486E on board Ethernet" - depends on NET_ISA - help - Say Y here to support the 82596-based on-board Ethernet controller - for the Panther motherboard, which is one of the two shipped in the - Intel Professional Workstation. - config ETH16I tristate "ICL EtherTeam 16i/32 support" depends on NET_ISA @@ -828,16 +684,6 @@ config ETH16I To compile this driver as a module, choose M here. The module will be called eth16i. -config ZNET - tristate "Zenith Z-Note support (EXPERIMENTAL)" - depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API - help - The Zenith Z-Note notebook computer has a built-in network - (Ethernet) card, and this is the Linux driver for it. Note that the - IBM Thinkpad 300 is compatible with the Z-Note and is also supported - by this driver. Read the Ethernet-HOWTO, available from - . - config SEEQ8005 tristate "SEEQ8005 support (EXPERIMENTAL)" depends on NET_ISA && EXPERIMENTAL @@ -915,17 +761,6 @@ config KSZ884X_PCI To compile this driver as a module, choose M here. The module will be called ksz884x. -config APRICOT - tristate "Apricot Xen-II on board Ethernet" - depends on NET_PCI && ISA - help - If you have a network (Ethernet) controller of this type, say Y and - read the Ethernet-HOWTO, available from - . - - To compile this driver as a module, choose M here. The module - will be called apricot. - config FORCEDETH tristate "nForce Ethernet support" depends on NET_PCI && PCI -- cgit v1.1