diff options
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 167 | ||||
| -rw-r--r-- | drivers/net/Makefile | 17 | ||||
| -rw-r--r-- | drivers/net/arm/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/net/arm/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/3c505.c (renamed from drivers/net/3c505.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/3c505.h (renamed from drivers/net/3c505.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/3c507.c (renamed from drivers/net/3c507.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/3c523.c (renamed from drivers/net/3c523.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/3c523.h (renamed from drivers/net/3c523.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/3c527.c (renamed from drivers/net/3c527.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/3c527.h (renamed from drivers/net/3c527.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/82596.c (renamed from drivers/net/82596.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/Kconfig | 182 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/Makefile | 20 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/eepro.c (renamed from drivers/net/eepro.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/eexpress.c (renamed from drivers/net/eexpress.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/eexpress.h (renamed from drivers/net/eexpress.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/ether1.c (renamed from drivers/net/arm/ether1.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/ether1.h (renamed from drivers/net/arm/ether1.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/lasi_82596.c (renamed from drivers/net/lasi_82596.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/lib82596.c (renamed from drivers/net/lib82596.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/lp486e.c (renamed from drivers/net/lp486e.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/ni52.c (renamed from drivers/net/ni52.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/ni52.h (renamed from drivers/net/ni52.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/sni_82596.c (renamed from drivers/net/sni_82596.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/sun3_82586.c (renamed from drivers/net/sun3_82586.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/sun3_82586.h (renamed from drivers/net/sun3_82586.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/i825xx/znet.c (renamed from drivers/net/znet.c) | 0 |
31 files changed, 208 insertions, 194 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7c0294cdf9f..5b368ccf757 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,7 +117,7 @@ Maintainers List (try to look for most precise areas first) M: Philip Blundell <philb@gnu.org> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/3c505* +F: drivers/net/ethernet/i825xx/3c505* 3C59X NETWORK DRIVER M: Steffen Klassert <klassert@mathematik.tu-chemnitz.de> @@ -1014,7 +1014,7 @@ F: arch/arm/include/asm/hardware/ioc.h F: arch/arm/include/asm/hardware/iomd.h F: arch/arm/include/asm/hardware/memc.h F: arch/arm/mach-rpc/ -F: drivers/net/arm/ether* +F: drivers/net/arm/ether3* F: drivers/scsi/arm/ ARM/SHARK MACHINE SUPPORT @@ -2510,7 +2510,7 @@ ETHEREXPRESS-16 NETWORK DRIVER M: Philip Blundell <philb@gnu.org> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/eexpress.* +F: drivers/net/ethernet/i825xx/eexpress.* ETHERNET BRIDGE M: Stephen Hemminger <shemminger@linux-foundation.org> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 649918609cb..d7d0b3532bc 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -306,47 +306,6 @@ config MACMACE say Y and read the Ethernet-HOWTO, available from <http://www.tldp.org/docs.html#howto>. -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 - <http://www.tldp.org/docs.html#howto>. - - 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 - <file:Documentation/networking/3c505.txt>. If you have a card of - this type, say Y and read the Ethernet-HOWTO, available from - <http://www.tldp.org/docs.html#howto>. - - 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 - <http://www.tldp.org/docs.html#howto>. - - 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 - <http://www.tldp.org/docs.html#howto>. - - 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 - <http://www.tldp.org/docs.html#howto>. - - 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 <http://www.tldp.org/docs.html#howto>. 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 - <http://www.tldp.org/docs.html#howto>. - - 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 - <http://www.tldp.org/docs.html#howto>. 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 - <http://www.tldp.org/docs.html#howto>. - - 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 - <http://www.tldp.org/docs.html#howto>. - 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 - <http://www.tldp.org/docs.html#howto>. - - 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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index e74b4244ee7..49b3e87075d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -130,36 +130,19 @@ obj-$(CONFIG_MACVLAN) += macvlan.o obj-$(CONFIG_MACVTAP) += macvtap.o obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE620) += de620.o -obj-$(CONFIG_SUN3_82586) += sun3_82586.o obj-$(CONFIG_DEFXX) += defxx.o obj-$(CONFIG_SGISEEQ) += sgiseeq.o obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o obj-$(CONFIG_AT1700) += at1700.o -obj-$(CONFIG_EL16) += 3c507.o -obj-$(CONFIG_ELMC) += 3c523.o obj-$(CONFIG_IBMLANA) += ibmlana.o -obj-$(CONFIG_ELMC_II) += 3c527.o -obj-$(CONFIG_EEXPRESS) += eexpress.o -obj-$(CONFIG_EEXPRESS_PRO) += eepro.o obj-$(CONFIG_8139CP) += 8139cp.o obj-$(CONFIG_8139TOO) += 8139too.o -obj-$(CONFIG_ZNET) += znet.o obj-$(CONFIG_CPMAC) += cpmac.o obj-$(CONFIG_EWRK3) += ewrk3.o obj-$(CONFIG_ATP) += atp.o obj-$(CONFIG_NI5010) += ni5010.o -obj-$(CONFIG_NI52) += ni52.o -obj-$(CONFIG_ELPLUS) += 3c505.o -obj-$(CONFIG_APRICOT) += 82596.o -obj-$(CONFIG_LASI_82596) += lasi_82596.o -obj-$(CONFIG_SNI_82596) += sni_82596.o -obj-$(CONFIG_MVME16x_NET) += 82596.o -obj-$(CONFIG_BVME6000_NET) += 82596.o obj-$(CONFIG_SC92031) += sc92031.o -# This is also a 82596 and should probably be merged -obj-$(CONFIG_LP486E) += lp486e.o - obj-$(CONFIG_ETH16I) += eth16i.o obj-$(CONFIG_EQUALIZER) += eql.o obj-$(CONFIG_KORINA) += korina.o diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig index 715bf2acc24..7848b5f6701 100644 --- a/drivers/net/arm/Kconfig +++ b/drivers/net/arm/Kconfig @@ -3,13 +3,6 @@ # These are for Acorn's Expansion card network interfaces # -config ARM_ETHER1 - tristate "Acorn Ether1 support" - depends on ARM && ARCH_ACORN - help - If you have an Acorn system with one of these (AKA25) network cards, - you should say Y to this option if you wish to use it with Linux. - config ARM_ETHER3 tristate "Acorn/ANT Ether3 support" depends on ARM && ARCH_ACORN diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile index f1e6150b675..6cca728b809 100644 --- a/drivers/net/arm/Makefile +++ b/drivers/net/arm/Makefile @@ -4,7 +4,6 @@ # obj-$(CONFIG_ARM_ETHER3) += ether3.o -obj-$(CONFIG_ARM_ETHER1) += ether1.o obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index ed5836ccb8d..d0a8fa8ab7e 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -17,6 +17,7 @@ source "drivers/net/ethernet/amd/Kconfig" source "drivers/net/ethernet/broadcom/Kconfig" source "drivers/net/ethernet/chelsio/Kconfig" source "drivers/net/ethernet/intel/Kconfig" +source "drivers/net/ethernet/i825xx/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/smsc/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 983fd275215..6d3276a4801 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -8,5 +8,6 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ +obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ diff --git a/drivers/net/3c505.c b/drivers/net/ethernet/i825xx/3c505.c index 88d766ee0e1..88d766ee0e1 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/ethernet/i825xx/3c505.c diff --git a/drivers/net/3c505.h b/drivers/net/ethernet/i825xx/3c505.h index 04df2a9002b..04df2a9002b 100644 --- a/drivers/net/3c505.h +++ b/drivers/net/ethernet/i825xx/3c505.h diff --git a/drivers/net/3c507.c b/drivers/net/ethernet/i825xx/3c507.c index 1e945551c14..1e945551c14 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/ethernet/i825xx/3c507.c diff --git a/drivers/net/3c523.c b/drivers/net/ethernet/i825xx/3c523.c index bc0d1a1c2e2..bc0d1a1c2e2 100644 --- a/drivers/net/3c523.c +++ b/drivers/net/ethernet/i825xx/3c523.c diff --git a/drivers/net/3c523.h b/drivers/net/ethernet/i825xx/3c523.h index 6956441687b..6956441687b 100644 --- a/drivers/net/3c523.h +++ b/drivers/net/ethernet/i825xx/3c523.h diff --git a/drivers/net/3c527.c b/drivers/net/ethernet/i825xx/3c527.c index d9d056d207f..d9d056d207f 100644 --- a/drivers/net/3c527.c +++ b/drivers/net/ethernet/i825xx/3c527.c diff --git a/drivers/net/3c527.h b/drivers/net/ethernet/i825xx/3c527.h index d693b8d15cd..d693b8d15cd 100644 --- a/drivers/net/3c527.h +++ b/drivers/net/ethernet/i825xx/3c527.h diff --git a/drivers/net/82596.c b/drivers/net/ethernet/i825xx/82596.c index be1f1970c84..be1f1970c84 100644 --- a/drivers/net/82596.c +++ b/drivers/net/ethernet/i825xx/82596.c diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig new file mode 100644 index 00000000000..5c30a5b3cba --- /dev/null +++ b/drivers/net/ethernet/i825xx/Kconfig @@ -0,0 +1,182 @@ +# +# Intel 82596/82593/82596 network device configuration +# + +config NET_VENDOR_I825XX + bool "Intel (82586/82593/82596) devices" + depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \ + ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \ + GSC || BVME6000 || MVME16x || EXPERIMENTAL) + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question does not directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about these devices. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_I825XX + +config ELPLUS + tristate "3c505 \"EtherLink Plus\" support" + depends on ISA && ISA_DMA_API + ---help--- + Information about this network (Ethernet) card can be found in + <file:Documentation/networking/3c505.txt>. If you have a card of + this type, say Y and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + 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 + <http://www.tldp.org/docs.html#howto>. + + 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 + <http://www.tldp.org/docs.html#howto>. + + 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 + <http://www.tldp.org/docs.html#howto>. + + To compile this driver as a module, choose M here. The module + will be called 3c527. + +config ARM_ETHER1 + tristate "Acorn Ether1 support" + depends on ARM && ARCH_ACORN + ---help--- + If you have an Acorn system with one of these (AKA25) network cards, + you should say Y to this option if you wish to use it with Linux. + +config APRICOT + tristate "Apricot Xen-II on board Ethernet" + depends on ISA + ---help--- + If you have a network (Ethernet) controller of this type, say Y and + read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + To compile this driver as a module, choose M here. The module + will be called apricot. + +config BVME6000_NET + tristate "BVME6000 Ethernet support" + depends on BVME6000MVME16x + ---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 EEXPRESS + tristate "EtherExpress 16 support" + depends on ISA + ---help--- + If you have an EtherExpress16 network (Ethernet) card, say Y and + read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. 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 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 + <http://www.tldp.org/docs.html#howto>. + + To compile this driver as a module, choose M here. The module + will be called eepro. + +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 LP486E + tristate "LP486E on board Ethernet" + depends on 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 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 NI52 + tristate "NI5210 support" + depends on ISA + ---help--- + If you have a network (Ethernet) card of this type, say Y and read + the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + To compile this driver as a module, choose M here. The module + will be called ni52. + +config SNI_82596 + tristate "SNI RM ethernet" + depends on SNI_RM + ---help--- + Say Y here to support the on-board Intel 82596 ethernet controller + built into SNI RM machines. + +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 ZNET + tristate "Zenith Z-Note support (EXPERIMENTAL)" + depends on 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 + <http://www.tldp.org/docs.html#howto>. + +endif # NET_VENDOR_I825XX diff --git a/drivers/net/ethernet/i825xx/Makefile b/drivers/net/ethernet/i825xx/Makefile new file mode 100644 index 00000000000..f68a3694968 --- /dev/null +++ b/drivers/net/ethernet/i825xx/Makefile @@ -0,0 +1,20 @@ +# +# Makefile for the Intel 82586/82593/82596 chipset device drivers. +# + +obj-$(CONFIG_ARM_ETHER1) += ether1.o +obj-$(CONFIG_EEXPRESS) += eexpress.o +obj-$(CONFIG_EEXPRESS_PRO) += eepro.o +obj-$(CONFIG_ELPLUS) += 3c505.o +obj-$(CONFIG_EL16) += 3c507.o +obj-$(CONFIG_ELMC) += 3c523.o +obj-$(CONFIG_ELMC_II) += 3c527.o +obj-$(CONFIG_LP486E) += lp486e.o +obj-$(CONFIG_NI52) += ni52.o +obj-$(CONFIG_SUN3_82586) += sun3_82586.o +obj-$(CONFIG_ZNET) += znet.o +obj-$(CONFIG_APRICOT) += 82596.o +obj-$(CONFIG_LASI_82596) += lasi_82596.o +obj-$(CONFIG_SNI_82596) += sni_82596.o +obj-$(CONFIG_MVME16x_NET) += 82596.o +obj-$(CONFIG_BVME6000_NET) += 82596.o diff --git a/drivers/net/eepro.c b/drivers/net/ethernet/i825xx/eepro.c index dfeb006035d..dfeb006035d 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/ethernet/i825xx/eepro.c diff --git a/drivers/net/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c index a19228563ef..a19228563ef 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/ethernet/i825xx/eexpress.c diff --git a/drivers/net/eexpress.h b/drivers/net/ethernet/i825xx/eexpress.h index dc9c6ea289e..dc9c6ea289e 100644 --- a/drivers/net/eexpress.h +++ b/drivers/net/ethernet/i825xx/eexpress.h diff --git a/drivers/net/arm/ether1.c b/drivers/net/ethernet/i825xx/ether1.c index b00781c02d5..b00781c02d5 100644 --- a/drivers/net/arm/ether1.c +++ b/drivers/net/ethernet/i825xx/ether1.c diff --git a/drivers/net/arm/ether1.h b/drivers/net/ethernet/i825xx/ether1.h index 3a5830ab3dc..3a5830ab3dc 100644 --- a/drivers/net/arm/ether1.h +++ b/drivers/net/ethernet/i825xx/ether1.h diff --git a/drivers/net/lasi_82596.c b/drivers/net/ethernet/i825xx/lasi_82596.c index 6eba352c52e..6eba352c52e 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/ethernet/i825xx/lasi_82596.c diff --git a/drivers/net/lib82596.c b/drivers/net/ethernet/i825xx/lib82596.c index 9e042894479..9e042894479 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/ethernet/i825xx/lib82596.c diff --git a/drivers/net/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c index 385a95311cd..385a95311cd 100644 --- a/drivers/net/lp486e.c +++ b/drivers/net/ethernet/i825xx/lp486e.c diff --git a/drivers/net/ni52.c b/drivers/net/ethernet/i825xx/ni52.c index d973fc6c6b8..d973fc6c6b8 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ethernet/i825xx/ni52.c diff --git a/drivers/net/ni52.h b/drivers/net/ethernet/i825xx/ni52.h index 0a03b288332..0a03b288332 100644 --- a/drivers/net/ni52.h +++ b/drivers/net/ethernet/i825xx/ni52.h diff --git a/drivers/net/sni_82596.c b/drivers/net/ethernet/i825xx/sni_82596.c index 6b2a8881747..6b2a8881747 100644 --- a/drivers/net/sni_82596.c +++ b/drivers/net/ethernet/i825xx/sni_82596.c diff --git a/drivers/net/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c index b6ae53bada7..b6ae53bada7 100644 --- a/drivers/net/sun3_82586.c +++ b/drivers/net/ethernet/i825xx/sun3_82586.c diff --git a/drivers/net/sun3_82586.h b/drivers/net/ethernet/i825xx/sun3_82586.h index 93346f00486..93346f00486 100644 --- a/drivers/net/sun3_82586.h +++ b/drivers/net/ethernet/i825xx/sun3_82586.h diff --git a/drivers/net/znet.c b/drivers/net/ethernet/i825xx/znet.c index 8b8881718f5..8b8881718f5 100644 --- a/drivers/net/znet.c +++ b/drivers/net/ethernet/i825xx/znet.c |