---

yaml --- r: 114255 b: refs/heads/master c: bc0da3f h: refs/heads/master i: 114253: b28db3b 114251: 5fe0616 114247: e23fde1 114239: 53db01d v: v3
git-mirror · Oct 14, 2008 · edb258a · edb258a
1 parent 5cb080f
commit edb258a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebe05d06a5051e7ddc07d76eab541a1d6b6eafcd
+refs/heads/master: bc0da3fcec1cec11dc451b8fcb9c9ad7e4ca6e12
diff --git a/trunk/drivers/net/tulip/de2104x.c b/trunk/drivers/net/tulip/de2104x.c
@@ -1688,6 +1688,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
 	unsigned i;
 
 	dw32 (ROMCmd, 0);	/* Reset the pointer with a dummy write. */
+	udelay(5);
 
 	for (i = 0; i < 6; i++) {
 		int value, boguscnt = 100000;