2006-01-22 Thomas Schwinge <tschwinge@gnu.org>

* configure, i386/configure, i386/linux/configure, linux/configure,
	i386/linux/device-drivers.h.in: Regenerated.

	* linux/src/drivers/net/ne2k-pci.c: Resolve conflicts.

2006-01-22  Guillem Jover  <guillem@hadrons.org>

	* i386/linux/configure.ac: Renamed winbond-840 driver to winbond_840.
	Enable the starfire, intel_gige and natsemi network drivers.  Remove
	"CONFIG_" from cb_chim, starfire, sundance, winbond840, hamachi,
	natsemi, myson803 and ns820 driver declarations.  Replace INTER_GIGE
	with INTEL_GIGE.
	* linux/dev/drivers/net/Space.c: Add conditional probes for natsemi,
	ns820, winbond840, hamachi, sundance, starfire, myson803 and intel-gige
	drivers.

	* linux/src/include/asm-i386/cache.h: New file from linux 2.2.26.
	* linux/dev/include/linux/malloc.h: Include <asm/cache.h>.

	* linux/src/drivers/net/ns820.c (netsami_drv_id): Renamed to ...
	(ns820_drv_id): ... this.  Fix all callers.
	* linux/src/drivers/net/intel-gige.c
	(skel_netdev_probe): Renamed to ...
	(igige_probe): ... this.
	* linux/dev/drivers/net/eepro100.c: Remove obsoleted file.
	* linux/src/drivers/net/eepro100.c (pci_id_tbl): Add PCI ID's from
	linux-2.6.14-rc4.

2006-01-22  Alfred M. Szmidt  <ams@gnu.org>

	* i386/linux/configure.ac: Added `pci-scan.o' to the network driver
	class.  (ns820, myson803, sundance, winbond-840, hamachi): New drivers.
	* i386/linux/Makefile.in (linux-net-files): Added `cb_shim.c',
	`hamachi.c', `intel-gige.c', `myson803.c', `natsemi.c', `ns820.c',
	`starfire.c', `sundance.c', `winbond-840.c' and `pci-scan.c'.

	* linux/dev/include/linux/modversions.h: New file.

	* linux/src/drivers/net/cb_shim.c, linux/src/drivers/net/hamachi.c,
	linux/src/drivers/net/intel-gige.c, linux/src/drivers/net/myson803.c,
	linux/src/drivers/net/natsemi.c, linux/src/drivers/net/ns820.c,
	linux/src/drivers/net/starfire.c, linux/src/drivers/net/sundance.c,
	linux/src/drivers/net/winbond-840.c,
	linux/src/drivers/net/kern_compat.h, linux/src/drivers/net/pci-scan.c,
	linux/src/drivers/net/pci-scan.h: New files from netdrivers 3.5 package
	(http://www.scyld.com/network).

	* linux/src/drivers/net/3c59x.c, linux/src/drivers/net/eepro100.c,
	linux/src/drivers/net/epic100.c, linux/src/drivers/net/ne2k-pci.c,
	linux/src/drivers/net/rtl8139.c, linux/src/drivers/net/tulip.c,
	linux/src/drivers/net/via-rhine.c, linux/src/drivers/net/yellowfin.c:
	Updated files from netdrivers 3.5 (http://www.scyld.com/network).

1 files changed, 55 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7124a1e..6e22cd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,60 @@
 2006-01-22  Thomas Schwinge  <tschwinge@gnu.org>
 
+	* configure, i386/configure, i386/linux/configure, linux/configure,
+	i386/linux/device-drivers.h.in: Regenerated.
+
+	* linux/src/drivers/net/ne2k-pci.c: Resolve conflicts.
+
+2006-01-22  Guillem Jover  <guillem@hadrons.org>
+
+	* i386/linux/configure.ac: Renamed winbond-840 driver to winbond_840.
+	Enable the starfire, intel_gige and natsemi network drivers.  Remove
+	"CONFIG_" from cb_chim, starfire, sundance, winbond840, hamachi,
+	natsemi, myson803 and ns820 driver declarations.  Replace INTER_GIGE
+	with INTEL_GIGE.
+	* linux/dev/drivers/net/Space.c: Add conditional probes for natsemi,
+	ns820, winbond840, hamachi, sundance, starfire, myson803 and intel-gige
+	drivers.
+
+	* linux/src/include/asm-i386/cache.h: New file from linux 2.2.26.
+	* linux/dev/include/linux/malloc.h: Include <asm/cache.h>.
+
+	* linux/src/drivers/net/ns820.c (netsami_drv_id): Renamed to ...
+	(ns820_drv_id): ... this.  Fix all callers.
+	* linux/src/drivers/net/intel-gige.c
+	(skel_netdev_probe): Renamed to ...
+	(igige_probe): ... this.
+	* linux/dev/drivers/net/eepro100.c: Remove obsoleted file.
+	* linux/src/drivers/net/eepro100.c (pci_id_tbl): Add PCI ID's from
+	linux-2.6.14-rc4.
+
+2006-01-22  Alfred M. Szmidt  <ams@gnu.org>
+
+	* i386/linux/configure.ac: Added `pci-scan.o' to the network driver
+	class.  (ns820, myson803, sundance, winbond-840, hamachi): New drivers.
+	* i386/linux/Makefile.in (linux-net-files): Added `cb_shim.c',
+	`hamachi.c', `intel-gige.c', `myson803.c', `natsemi.c', `ns820.c',
+	`starfire.c', `sundance.c', `winbond-840.c' and `pci-scan.c'.
+
+	* linux/dev/include/linux/modversions.h: New file.
+
+	* linux/src/drivers/net/cb_shim.c, linux/src/drivers/net/hamachi.c,
+	linux/src/drivers/net/intel-gige.c, linux/src/drivers/net/myson803.c,
+	linux/src/drivers/net/natsemi.c, linux/src/drivers/net/ns820.c,
+	linux/src/drivers/net/starfire.c, linux/src/drivers/net/sundance.c,
+	linux/src/drivers/net/winbond-840.c,
+	linux/src/drivers/net/kern_compat.h, linux/src/drivers/net/pci-scan.c,
+	linux/src/drivers/net/pci-scan.h: New files from netdrivers 3.5 package
+	(http://www.scyld.com/network).
+
+	* linux/src/drivers/net/3c59x.c, linux/src/drivers/net/eepro100.c,
+	linux/src/drivers/net/epic100.c, linux/src/drivers/net/ne2k-pci.c,
+	linux/src/drivers/net/rtl8139.c, linux/src/drivers/net/tulip.c,
+	linux/src/drivers/net/via-rhine.c, linux/src/drivers/net/yellowfin.c:
+	Updated files from netdrivers 3.5 (http://www.scyld.com/network).
+
+2006-01-22  Thomas Schwinge  <tschwinge@gnu.org>
+
 	* linux/src/drivers/net/ne2k-pci.c (ne_block_input, ne_block_output):
 	Fix previous patch.