diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 08:59:45 -0400 |
| commit | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (patch) | |
| tree | 351a40b72514d620e5bebea2de38c26f23277ffc /drivers/net/sungem_phy.c | |
| parent | 28df955a2ad484d602314b30183ea8496a9aa34a (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/sungem_phy.c')
| -rw-r--r-- | drivers/net/sungem_phy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c index b2ddd5e79303..9282b4b0c022 100644 --- a/drivers/net/sungem_phy.c +++ b/drivers/net/sungem_phy.c | |||
| @@ -345,9 +345,9 @@ static int bcm5421_enable_fiber(struct mii_phy* phy) | |||
| 345 | 345 | ||
| 346 | static int bcm5461_enable_fiber(struct mii_phy* phy) | 346 | static int bcm5461_enable_fiber(struct mii_phy* phy) |
| 347 | { | 347 | { |
| 348 | phy_write(phy, MII_NCONFIG, 0xfc0c); | 348 | phy_write(phy, MII_NCONFIG, 0xfc0c); |
| 349 | phy_write(phy, MII_BMCR, 0x4140); | 349 | phy_write(phy, MII_BMCR, 0x4140); |
| 350 | phy_write(phy, MII_NCONFIG, 0xfc0b); | 350 | phy_write(phy, MII_NCONFIG, 0xfc0b); |
| 351 | phy_write(phy, MII_BMCR, 0x0140); | 351 | phy_write(phy, MII_BMCR, 0x0140); |
| 352 | 352 | ||
| 353 | return 0; | 353 | return 0; |