summaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip/de2104x.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-10-10 14:50:46 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-10-18 18:03:47 -0400
commitbc053d45cb0ca5daeaa69ae9ac43cdea42693f60 (patch)
tree1512d6f1f84744212c6138e02fde5c2f21227f8e /drivers/net/tulip/de2104x.c
parent7f553e3db46b36d2662e1118f8b8fdbf086b76df (diff)
downloadlinux-bc053d45cb0ca5daeaa69ae9ac43cdea42693f60.tar.gz
linux-bc053d45cb0ca5daeaa69ae9ac43cdea42693f60.tar.bz2
linux-bc053d45cb0ca5daeaa69ae9ac43cdea42693f60.zip
[PATCH] de2104x: Resurrect Cobalt support for 2.6.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/tulip/de2104x.c | 5 +++++ 1 files changed, 5 insertions(+) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/tulip/de2104x.c')
-rw-r--r--drivers/net/tulip/de2104x.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index a22d00198e4d..6b8eee8f7bfd 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1787,10 +1787,15 @@ static void __init de21041_get_srom_info (struct de_private *de)
/* DEC now has a specification but early board makers
just put the address in the first EEPROM locations. */
/* This does memcmp(eedata, eedata+16, 8) */
+
+#ifndef CONFIG_MIPS_COBALT
+
for (i = 0; i < 8; i ++)
if (ee_data[i] != ee_data[16+i])
sa_offset = 20;
+#endif
+
/* store MAC address */
for (i = 0; i < 6; i ++)
de->dev->dev_addr[i] = ee_data[i + sa_offset];