Update of /cvsroot/gc-linux/linux/drivers/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21902/drivers/net
Modified Files:
Kconfig Makefile
Log Message:
Merged 2.6.3
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig 14 Feb 2004 17:50:21 -0000 1.2
+++ Kconfig 18 Feb 2004 20:01:58 -0000 1.3
@@ -1583,6 +1583,24 @@
experience problems, you can enable this option to restore the
old RX-reset behavior. If unsure, say N.
+config 8139_RXBUF_IDX
+ int "Receive ring size (0 => 8K, 1 => 16K, 2 => 32K, 3 => 64K)"
+ depends on 8139TOO
+ range 0 3
+ default 1 if EMBEDDED || SH_DREAMCAST
+ default 2
+ help
+ The 8139too driver has a fixed area of memory for receiving data.
+ The default value is adequate for most systems. The 64KB
+ ring size has hardware issues that may cause problems.
+ Values:
+ 0 => 8 KB
+ 1 => 16 KB embedded systems
+ 2 => 32 KB default for most systems
+ 3 => 64 KB
+ If unsure, use the default 2.
+
+
config SIS900
tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
depends on NET_PCI && PCI
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 14 Feb 2004 17:50:21 -0000 1.2
+++ Makefile 18 Feb 2004 20:01:58 -0000 1.3
@@ -112,7 +112,6 @@
obj-$(CONFIG_DUMMY) += dummy.o
obj-$(CONFIG_DE600) += de600.o
obj-$(CONFIG_DE620) += de620.o
-obj-$(CONFIG_AT1500) += lance.o
obj-$(CONFIG_LANCE) += lance.o
obj-$(CONFIG_SUN3_82586) += sun3_82586.o
obj-$(CONFIG_SUN3LANCE) += sun3lance.o
|
