summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2004-10-26 05:23:00 +0000
committerGuillem Jover <guillem@debian.org>2004-10-26 05:23:00 +0000
commit626894d635c88c148205f6a72ef39b10f98f45d4 (patch)
treee93446d8e122866e764de6798ddea3598390652a
parentc42b424e5414158c5844aba0051b2aed1e9feb72 (diff)
Fix ChangeLog entries.
-rw-r--r--debian/patches/00_autoconf_update.patch2
-rw-r--r--debian/patches/11_nic_update.patch25
2 files changed, 16 insertions, 11 deletions
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 <guillem@hadrons.org>
* 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 <guillem@hadrons.org>
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 <guillem@hadrons.org>
- * 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 <asm/cache.h>.
- * 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 <arief_mulya@yahoo.com>