From 63630da132b5a139005920ade7da79eef3c4acd0 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 10 Oct 2005 14:50:46 +0100
Subject: [PATCH] --- yaml --- r: 10325 b: refs/heads/master c:
 bc053d45cb0ca5daeaa69ae9ac43cdea42693f60 h: refs/heads/master i:   10323:
 642f6813d63afbdf68fcdde69111606f35d60f5a v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/tulip/de2104x.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a00475cf68e7..4310bf89de37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f553e3db46b36d2662e1118f8b8fdbf086b76df
+refs/heads/master: bc053d45cb0ca5daeaa69ae9ac43cdea42693f60
diff --git a/trunk/drivers/net/tulip/de2104x.c b/trunk/drivers/net/tulip/de2104x.c
index a22d00198e4d..6b8eee8f7bfd 100644
--- a/trunk/drivers/net/tulip/de2104x.c
+++ b/trunk/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];