diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /drivers/net/fec.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'drivers/net/fec.c')
| -rw-r--r-- | drivers/net/fec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index cce32d43175f..52e9ca8de4b2 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
| @@ -651,8 +651,8 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum, | |||
| 651 | fep->mii_timeout = 0; | 651 | fep->mii_timeout = 0; |
| 652 | init_completion(&fep->mdio_done); | 652 | init_completion(&fep->mdio_done); |
| 653 | 653 | ||
| 654 | /* start a read op */ | 654 | /* start a write op */ |
| 655 | writel(FEC_MMFR_ST | FEC_MMFR_OP_READ | | 655 | writel(FEC_MMFR_ST | FEC_MMFR_OP_WRITE | |
| 656 | FEC_MMFR_PA(mii_id) | FEC_MMFR_RA(regnum) | | 656 | FEC_MMFR_PA(mii_id) | FEC_MMFR_RA(regnum) | |
| 657 | FEC_MMFR_TA | FEC_MMFR_DATA(value), | 657 | FEC_MMFR_TA | FEC_MMFR_DATA(value), |
| 658 | fep->hwp + FEC_MII_DATA); | 658 | fep->hwp + FEC_MII_DATA); |