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;