Author: tbm Date: Mon May 21 11:19:47 2007 New Revision: 8634 Log: fix patch
Modified: dists/trunk/linux-2.6/debian/patches/bugfix/mips/64bit-tulip.patch dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Modified: dists/trunk/linux-2.6/debian/patches/bugfix/mips/64bit-tulip.patch ============================================================================== --- dists/trunk/linux-2.6/debian/patches/bugfix/mips/64bit-tulip.patch (original) +++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/64bit-tulip.patch Mon May 21 11:19:47 2007 @@ -3,17 +3,16 @@ ## DP: Not sure whether this is needed or not, but we've had it for ## DP: quite a while. I'll try to find out -- tbm ---- a/drivers/net/tulip/tulip.h 2006-11-19 19:14:20.000000000 +0000 -+++ b/drivers/net/tulip/tulip.h 2006-11-19 19:15:11.000000000 +0000 -@@ -1493,8 +1493,8 @@ +--- a/drivers/net/tulip/tulip_core.c 2007-05-21 11:12:45.000000000 +0000 ++++ b/drivers/net/tulip/tulip_core.c 2007-05-21 11:13:10.000000000 +0000 +@@ -1490,8 +1490,8 @@ (PCI_SLOT(pdev->devfn) == 12))) { /* Cobalt MAC address in first EEPROM locations. */ sa_offset = 0; - /* Ensure our media table fixup get's applied */ - memcpy(ee_data + 16, ee_data, 8); -+ /* No media table either */ -+ tp->flags &= ~HAS_MEDIA_TABLE; ++ /* No media table either */ ++ tp->flags &= ~HAS_MEDIA_TABLE; } #endif #ifdef CONFIG_GSC - Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 (original) +++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Mon May 21 11:19:47 2007 @@ -15,7 +15,7 @@ + bugfix/mips/ide-scan.patch + bugfix/mips/ip22-zilog-console.patch + bugfix/mips/sgi-ioc3.patch -#+ bugfix/mips/64bit-tulip.patch ++ bugfix/mips/64bit-tulip.patch + bugfix/mips/tulip_dc21143.patch + features/mips/qemu-vga.patch + features/mips/sb1-duart.patch _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes