From 626894d635c88c148205f6a72ef39b10f98f45d4 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Tue, 26 Oct 2004 05:23:00 +0000 Subject: Fix ChangeLog entries. --- debian/patches/00_autoconf_update.patch | 2 +- debian/patches/11_nic_update.patch | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/debian/patches/00_autoconf_update.patch b/debian/patches/00_autoconf_update.patch index 69f3129..aae2454 100644 --- a/debian/patches/00_autoconf_update.patch +++ b/debian/patches/00_autoconf_update.patch @@ -3,7 +3,7 @@ 2004-10-25 Guillem Jover * Drivers.macros (AC_DRIVER_CLASS): Use AH_TEMPLATE. - (AC_DRIVER): Set the value for the AC_DEFINE and AC_DEFINE_UNQUOTTED + (AC_DRIVER): Set the value for the AC_DEFINE and AC_DEFINE_UNQUOTED to 1. 2004-09-15 Guillem Jover diff --git a/debian/patches/11_nic_update.patch b/debian/patches/11_nic_update.patch index 211897b..ef3bd56 100644 --- a/debian/patches/11_nic_update.patch +++ b/debian/patches/11_nic_update.patch @@ -2,20 +2,25 @@ 2004-10-25 Guillem Jover - * i386/linux/configure.ac: Renamed winbond-840 driver to winbond_840. - Do not include "pci-skeleton.c" in the "net" driver class. Enable - intel_gige and natsemi network drivers. Remove "CONFIG_" from cb_chim, - starfire, sundance, winbond840, hamachi, natsemi, myson803 and ns820 - driver declarations. s/INTER_GIGE/INTEL_GIGE/. + * i386/linux/Drivers.in: Renamed winbond-840 driver to winbond_840. + Do not include "pci-skeleton.c" in the "net" AC_DRIVER_CLASS. + 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/src/include/asm-i386/cache.h: New file from linux 2.2.26. * linux/dev/include/linux/malloc.h: Include . - * linux/dev/drivers/net/ns820.c (netsami_drv_id): Renamed to ... + * linux/src/drivers/net/ns820.c: Copied to ... + * linux/dev/drivers/net/ns820.c: ... here. + (netsami_drv_id): Renamed to ... (ns820_drv_id): ... this. Fix all callers. - * linux/dev/drivers/net/intel-gige.c (skel_netdev_probe): Renamed to ... + * linux/src/drivers/net/intel-gige.c: Copied to ... + * linux/dev/drivers/net/intel-gige.c: ... here. + (skel_netdev_probe): Renamed to ... (igige_probe): ... this. - * linux/dev/drivers/net/Space.c: Add probes for natsemi, ns820, - winbond840, hamachi, sundance, starfire, myson803 and intel-gige - drivers. + * linux/dev/drivers/net/Space.c: Add conditional probes for natsemi, + ns820, winbond840, hamachi, sundance, starfire, myson803 and + intel-gige drivers. 2004-08-05 Arief M. Utama -- cgit v1.2.3