aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-05-13 01:19:43 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-13 01:19:43 -0700
commit99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch)
tree4f583715a29ac95723b85532f47c3c568a544f1d /drivers/net/sky2.c
parent7ef43ebaa538e0cc9063cbf84593a05091bcace2 (diff)
parent7d2e3cb7000b883a8e489485ac249be572fe17b1 (diff)
Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r--drivers/net/sky2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index f226bcac7d1..4b0f0335877 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3369,7 +3369,7 @@ static void sky2_led(struct sky2_port *sky2, enum led_mode mode)
gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
} else
- gm_phy_write(hw, port, PHY_MARV_LED_OVER,
+ gm_phy_write(hw, port, PHY_MARV_LED_OVER,
PHY_M_LED_MO_DUP(mode) |
PHY_M_LED_MO_10(mode) |
PHY_M_LED_MO_100(mode) |