Update of /cvsroot/gc-linux/linux/drivers/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24035/drivers/net
Modified Files:
Kconfig Makefile
Log Message:
Merged 2.6.5
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Kconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Kconfig 14 Mar 2004 23:45:44 -0000 1.4
+++ Kconfig 24 Apr 2004 18:31:44 -0000 1.5
@@ -2054,8 +2054,8 @@
If you want to compile this driver as a module ( = code which can be
inserted in and removed from the running kernel whenever you want),
- say M here and read Documentation/modules.txt. This is recommended.
- The module will be called sk98lin. This is recommended.
+ say M here and read Documentation/kbuild/modules.txt. The module will
+ be called sk98lin. This is recommended.
config TIGON3
tristate "Broadcom Tigon3 support"
@@ -2501,6 +2501,13 @@
To compile this driver as a module, choose M here: the module
will be called shaper. If unsure, say N.
+config NETCONSOLE
+ tristate "Network console logging support (EXPERIMENTAL)"
+ depends on NETDEVICES && EXPERIMENTAL
+ ---help---
+ If you want to log kernel messages over the network, enable this.
+ See Documentation/networking/netconsole.txt for details.
+
source "drivers/net/wan/Kconfig"
source "drivers/net/pcmcia/Kconfig"
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 14 Mar 2004 23:45:44 -0000 1.4
+++ Makefile 24 Apr 2004 18:31:44 -0000 1.5
@@ -189,3 +189,4 @@
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
+obj-$(CONFIG_NETCONSOLE) += netconsole.o
|
