* Martin Michlmayr <tbm@cyrius.com> [2006-02-24 01:13]:
> - should the CONFIG_DDB5477 change be reverted (probably)
OK, I managed to track down when this change was introduced, namely in
the merge with Linux 2.6.13-rc1. See
http://www.linux-mips.org/git?p=linux.git;a=blobdiff;h=e6781ea5ba055ec445f35c734a59db24e748be3a;hp=cfc346e72d6234ae37ee11b794791ee99fcec24e;hb=aa5fcc48f9ae2887b6c570411e73ef965f72a746;f=drivers/net/tulip/tulip_core.c
Ralf, please apply this to the mips-tree only (not for-linus).
[MIPS] Revert bogus tulip_core/DDB5477 change introduced in 2.6.13-rc1 merge
Merging with 2.6.13-rc1 introduced a change in the DDB5477 section of
tulip_core.c that was really meant for Cobalt (and was there already).
Revert this change, thereby syncing with Linus' tree.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- mips.git/drivers/net/tulip/tulip_core.c 2006-02-23 22:05:30.000000000
+0000
+++ linux.git/drivers/net/tulip/tulip_core.c 2006-02-03 03:07:03.000000000
+0000
@@ -1495,8 +1495,8 @@
if ((pdev->bus->number == 0) && (PCI_SLOT(pdev->devfn) == 4)) {
/* DDB5477 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;
}
#endif
#ifdef CONFIG_MIPS_COBALT
--
Martin Michlmayr
http://www.cyrius.com/
|