diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/sky2.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 6a10d7ba5877..a76cd66c2282 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -1975,7 +1975,7 @@ static void sky2_link_down(struct sky2_port *sky2) | |||
| 1975 | 1975 | ||
| 1976 | netif_carrier_off(sky2->netdev); | 1976 | netif_carrier_off(sky2->netdev); |
| 1977 | 1977 | ||
| 1978 | /* Turn on link LED */ | 1978 | /* Turn off link LED */ |
| 1979 | sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF); | 1979 | sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF); |
| 1980 | 1980 | ||
| 1981 | if (netif_msg_link(sky2)) | 1981 | if (netif_msg_link(sky2)) |