Update of /cvsroot/gc-linux/linux/drivers/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31080/drivers/net
Modified Files:
Kconfig Makefile
Log Message:
Merged 2.6.7
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Kconfig 11 May 2004 17:48:35 -0000 1.6
+++ Kconfig 16 Jun 2004 17:30:44 -0000 1.7
@@ -1216,6 +1216,39 @@
<file:Documentation/networking/net-modules.txt>. The module will
be called ibmveth.
+config IBM_EMAC
+ tristate "IBM PPC4xx EMAC driver support"
+ depends on 4xx
+ ---help---
+ This driver supports the IBM PPC4xx EMAC family of on-chip
+ Ethernet controllers.
+
+config IBM_EMAC_ERRMSG
+ bool "Verbose error messages"
+ depends on IBM_EMAC
+
+config IBM_EMAC_RXB
+ int "Number of receive buffers"
+ depends on IBM_EMAC
+ default "128" if IBM_EMAC4
+ default "64"
+
+config IBM_EMAC_TXB
+ int "Number of transmit buffers"
+ depends on IBM_EMAC
+ default "128" if IBM_EMAC4
+ default "8"
+
+config IBM_EMAC_FGAP
+ int "Frame gap"
+ depends on IBM_EMAC
+ default "8"
+
+config IBM_EMAC_SKBRES
+ int "Skb reserve amount"
+ depends on IBM_EMAC
+ default "0"
+
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on NET_ETHERNET && (ISA || EISA || PCI)
@@ -1834,6 +1867,13 @@
Say Y here if you want to use the built-in 10/100 Fast ethernet
controller on the Motorola ColdFire 5272 processor.
+config NE_H8300
+ tristate "NE2000 compatible support for H8/300"
+ depends on H8300 && NET_ETHERNET
+ help
+ Say Y here if you want to use the NE2000 compatible
+ controller on the Renesas H8/300 processor.
+
endmenu
#
@@ -2486,16 +2526,6 @@
To compile this driver as a module, choose M here: the module
will be called iph5526.
-config RCPCI
- tristate "Red Creek Hardware VPN (EXPERIMENTAL)"
- depends on NETDEVICES && EXPERIMENTAL && PCI && !64BIT
- help
- This is a driver for hardware which provides a Virtual Private
- Network (VPN). Say Y if you have it.
-
- To compile this driver as a module, choose M here: the module
- will be called rcpci.
-
config SHAPER
tristate "Traffic Shaper (EXPERIMENTAL)"
depends on NETDEVICES && EXPERIMENTAL
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 11 May 2004 17:48:35 -0000 1.6
+++ Makefile 16 Jun 2004 17:30:44 -0000 1.7
@@ -2,13 +2,12 @@
# Makefile for the Linux network (ethercard) device drivers.
#
-rcpci-objs := rcpci45.o rclanmtl.o
-
ifeq ($(CONFIG_ISDN_PPP),y)
obj-$(CONFIG_ISDN) += slhc.o
endif
obj-$(CONFIG_E1000) += e1000/
+obj-$(CONFIG_IBM_EMAC) += ibm_emac/
obj-$(CONFIG_IXGB) += ixgb/
obj-$(CONFIG_BONDING) += bonding/
@@ -32,7 +31,6 @@
obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
obj-$(CONFIG_DGRS) += dgrs.o
-obj-$(CONFIG_RCPCI) += rcpci.o
obj-$(CONFIG_VORTEX) += 3c59x.o
obj-$(CONFIG_TYPHOON) += typhoon.o
obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
@@ -95,6 +93,7 @@
obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o
obj-$(CONFIG_B44) += b44.o
obj-$(CONFIG_FORCEDETH) += forcedeth.o
+obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
obj-$(CONFIG_PPP) += ppp_generic.o slhc.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
|
