diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /drivers/net/sky2.c | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
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 013c9f52ceaa..89a05d674ddc 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -2017,7 +2017,7 @@ static void sky2_link_down(struct sky2_port *sky2) | |||
| 2017 | 2017 | ||
| 2018 | netif_carrier_off(sky2->netdev); | 2018 | netif_carrier_off(sky2->netdev); |
| 2019 | 2019 | ||
| 2020 | /* Turn on link LED */ | 2020 | /* Turn off link LED */ |
| 2021 | sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF); | 2021 | sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF); |
| 2022 | 2022 | ||
| 2023 | if (netif_msg_link(sky2)) | 2023 | if (netif_msg_link(sky2)) |