From edb258af15e5643235ce7a4f88d3c93b251fa0fb Mon Sep 17 00:00:00 2001 From: Martin Langer Date: Mon, 13 Oct 2008 18:49:38 -0700 Subject: [PATCH] --- yaml --- r: 114255 b: refs/heads/master c: bc0da3fcec1cec11dc451b8fcb9c9ad7e4ca6e12 h: refs/heads/master i: 114253: b28db3b102fe9d18e173ccc9e26cf421595d72db 114251: 5fe061686f666b628b7b84aaf41d40a0eaeb4e7e 114247: e23fde14378591da7fcfc85d80f30d53ac3c9875 114239: 53db01d55f1bfdfd066eca166bfc29fe3593f138 v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/de2104x.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e575d36f2cb9..d5b6cbabdd02 100644 --- 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 index f54c45049d50..124d5d690dde 100644 --- 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;