diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 13:28:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 13:28:49 -0400 |
| commit | 43096597a4cc4bd3f912be8a69dbd12e27e08038 (patch) | |
| tree | 88cb4ba7562b0883aa987ee43f42a6c9bf9cd05f /drivers/net/tulip/de2104x.c | |
| parent | 79aa79bac979323a8cb10438be16d29cf252167d (diff) | |
| parent | 485013717020cd8961337309e359d6cef43d6022 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
qlge: Fix page size ifdef test.
net: Rationalise email address: Network Specific Parts
dsa: fix compile bug on s390
netns: mib6 section fixlet
enic: Fix Kconfig headline description
de2104x: wrong MAC address fix
s390: claw compile fixlet
net: export genphy_restart_aneg
cxgb3: extend copyrights to 2008
cxgb3: update driver version
net/phy: add missing kernel-doc
pktgen: fix skb leak in case of failure
mISDN/dsp_cmx.c: fix size checks
misdn: use nonseekable_open()
net: fix driver build errors due to missing net/ip6_checksum.h include
Diffstat (limited to 'drivers/net/tulip/de2104x.c')
| -rw-r--r-- | drivers/net/tulip/de2104x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index f54c45049d50..124d5d690dde 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
| @@ -1688,6 +1688,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de) | |||
| 1688 | unsigned i; | 1688 | unsigned i; |
| 1689 | 1689 | ||
| 1690 | dw32 (ROMCmd, 0); /* Reset the pointer with a dummy write. */ | 1690 | dw32 (ROMCmd, 0); /* Reset the pointer with a dummy write. */ |
| 1691 | udelay(5); | ||
| 1691 | 1692 | ||
| 1692 | for (i = 0; i < 6; i++) { | 1693 | for (i = 0; i < 6; i++) { |
| 1693 | int value, boguscnt = 100000; | 1694 | int value, boguscnt = 100000; |