Update of /cvsroot/gc-linux/linux/drivers/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19469/drivers/net
Modified Files:
Kconfig Makefile
Log Message:
Merged 2.6.4
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kconfig 18 Feb 2004 20:01:58 -0000 1.3
+++ Kconfig 14 Mar 2004 23:45:44 -0000 1.4
@@ -1360,8 +1360,9 @@
say N.
config E100
- tristate "EtherExpressPro/100 support (e100, Alternate Intel driver)"
+ tristate "Intel(R) PRO/100+ support"
depends on NET_PCI && PCI
+ select MII
---help---
This driver supports Intel(R) PRO/100 family of adapters, which
includes:
@@ -1434,6 +1435,10 @@
<file:Documentation/networking/net-modules.txt>. The module
will be called e100.
+config E100_NAPI
+ bool "Use Rx Polling (NAPI)"
+ depends on E100
+
config LNE390
tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
depends on NET_PCI && EISA && EXPERIMENTAL
@@ -1546,6 +1551,7 @@
config 8139TOO_PIO
bool "Use PIO instead of MMIO"
+ default y
depends on 8139TOO
help
This instructs the driver to use programmed I/O ports (PIO) instead
@@ -1676,25 +1682,23 @@
select CRC32
select MII
help
- If you have a VIA "rhine" based network card (Rhine-I (3043) or
- Rhine-2 (VT86c100A)), say Y here.
+ If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A),
+ Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type
+ Ethernet functions can also be found integrated on South Bridges
+ (e.g. VT8235).
- To compile this driver as a module, choose M here and read
- <file:Documentation/networking/net-modules.txt>. The module
+ To compile this driver as a module, choose M here. The module
will be called via-rhine.
config VIA_RHINE_MMIO
- bool "Use MMIO instead of PIO (EXPERIMENTAL)"
- depends on VIA_RHINE && EXPERIMENTAL
+ bool "Use MMIO instead of PIO"
+ depends on VIA_RHINE
help
This instructs the driver to use PCI shared memory (MMIO) instead of
programmed I/O ports (PIO). Enabling this gives an improvement in
processing time in parts of the driver.
- It is not known if this works reliably on all "rhine" based cards,
- but it has been tested successfully on some DFE-530TX adapters.
-
- If unsure, say N.
+ If unsure, say Y.
config LAN_SAA9730
bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)"
@@ -1721,7 +1725,8 @@
<file:Documentation/Changes>) and you can say N here.
Laptop users should read the Linux Laptop home page at
- <http://www.linux-on-laptops.com/>.
+ <http://www.linux-on-laptops.com/> or
+ Tuxmobil - Linux on Mobile Computers at <http://www.tuxmobil.org/>.
Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
@@ -1990,6 +1995,7 @@
- Allied Telesyn AT-2970TX/2TX Gigabit Ethernet Adapter
- Allied Telesyn AT-2971SX Gigabit Ethernet Adapter
- Allied Telesyn AT-2971T Gigabit Ethernet Adapter
+ - Belkin Gigabit Desktop Card 10/100/1000Base-T Adapter, Copper RJ-45
- DGE-530T Gigabit Ethernet Adapter
- EG1032 v2 Instant Gigabit Network Adapter
- EG1064 v2 Instant Gigabit Network Adapter
@@ -2001,6 +2007,7 @@
- Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
- Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
- Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
+ - Marvell 88E8050 Gigabit LOM Ethernet Adapter (Intel)
- Marvell RDK-8001 Adapter
- Marvell RDK-8002 Adapter
- Marvell RDK-8003 Adapter
@@ -2012,6 +2019,7 @@
- Marvell RDK-8010 Adapter
- Marvell RDK-8011 Adapter
- Marvell RDK-8012 Adapter
+ - Marvell RDK-8052 Adapter
- Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)
- Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)
- N-Way PCI-Bus Giga-Card 1000/100/10Mbps(L)
@@ -2168,6 +2176,17 @@
under Linux, say Y here (you must also remember to enable the driver
for your HIPPI card below). Most people will say N here.
+config IBMVETH
+ tristate "IBM LAN Virtual Ethernet support"
+ depends on NETDEVICES && NET_ETHERNET && PPC_PSERIES
+ ---help---
+ This driver supports virtual ethernet adapters on newer IBM iSeries
+ and pSeries systems.
+
+ To compile this driver as a module, choose M here and read
+ <file:Documentation/networking/net-modules.txt>. The module will
+ be called ibmveth.
+
config ROADRUNNER
tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)"
depends on HIPPI && PCI
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 18 Feb 2004 20:01:58 -0000 1.3
+++ Makefile 14 Mar 2004 23:45:44 -0000 1.4
@@ -8,7 +8,6 @@
obj-$(CONFIG_ISDN) += slhc.o
endif
-obj-$(CONFIG_E100) += e100/
obj-$(CONFIG_E1000) += e1000/
obj-$(CONFIG_IXGB) += ixgb/
obj-$(CONFIG_BONDING) += bonding/
@@ -39,13 +38,13 @@
obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
obj-$(CONFIG_PCNET32) += pcnet32.o
obj-$(CONFIG_EEPRO100) += eepro100.o
+obj-$(CONFIG_E100) += e100.o
obj-$(CONFIG_TLAN) += tlan.o
obj-$(CONFIG_EPIC100) += epic100.o
obj-$(CONFIG_SIS190) += sis190.o
obj-$(CONFIG_SIS900) += sis900.o
obj-$(CONFIG_YELLOWFIN) += yellowfin.o
obj-$(CONFIG_ACENIC) += acenic.o
-obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NATSEMI) += natsemi.o
obj-$(CONFIG_NS83820) += ns83820.o
obj-$(CONFIG_STNIC) += stnic.o 8390.o
@@ -175,6 +174,7 @@
obj-$(CONFIG_DL2K) += dl2k.o
obj-$(CONFIG_R8169) += r8169.o
obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
+obj-$(CONFIG_IBMVETH) += ibmveth.o
obj-$(CONFIG_GAMECUBE_NET) += gc-net.o
obj-$(CONFIG_ARM) += arm/
|
