diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-04 19:52:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-04 19:52:41 -0500 |
| commit | 7870389478d3c682c79c07abe7f1fce8b8a81952 (patch) | |
| tree | 8dc50c5aa48c65c7eb5cc2770501a45f1e2371f6 /drivers/net/gianfar.c | |
| parent | 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (diff) | |
| parent | b98ac702f49042ab0c382b839465b95a2bd0cd65 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index dadd08cd801b..802a9516ce41 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -372,6 +372,9 @@ static int gfar_probe(struct of_device *ofdev, | |||
| 372 | /* Reset MAC layer */ | 372 | /* Reset MAC layer */ |
| 373 | gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET); | 373 | gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET); |
| 374 | 374 | ||
| 375 | /* We need to delay at least 3 TX clocks */ | ||
| 376 | udelay(2); | ||
| 377 | |||
| 375 | tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW); | 378 | tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW); |
| 376 | gfar_write(&priv->regs->maccfg1, tempval); | 379 | gfar_write(&priv->regs->maccfg1, tempval); |
| 377 | 380 | ||