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/ehea/ehea_ethtool.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/ehea/ehea_ethtool.c')
| -rw-r--r-- | drivers/net/ehea/ehea_ethtool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c index d76885223366..75b099ce49c9 100644 --- a/drivers/net/ehea/ehea_ethtool.c +++ b/drivers/net/ehea/ehea_ethtool.c | |||
| @@ -118,7 +118,7 @@ doit: | |||
| 118 | ret = ehea_set_portspeed(port, sp); | 118 | ret = ehea_set_portspeed(port, sp); |
| 119 | 119 | ||
| 120 | if (!ret) | 120 | if (!ret) |
| 121 | ehea_info("%s: Port speed succesfully set: %dMbps " | 121 | ehea_info("%s: Port speed successfully set: %dMbps " |
| 122 | "%s Duplex", | 122 | "%s Duplex", |
| 123 | port->netdev->name, port->port_speed, | 123 | port->netdev->name, port->port_speed, |
| 124 | port->full_duplex == 1 ? "Full" : "Half"); | 124 | port->full_duplex == 1 ? "Full" : "Half"); |
| @@ -134,7 +134,7 @@ static int ehea_nway_reset(struct net_device *dev) | |||
| 134 | ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG); | 134 | ret = ehea_set_portspeed(port, EHEA_SPEED_AUTONEG); |
| 135 | 135 | ||
| 136 | if (!ret) | 136 | if (!ret) |
| 137 | ehea_info("%s: Port speed succesfully set: %dMbps " | 137 | ehea_info("%s: Port speed successfully set: %dMbps " |
| 138 | "%s Duplex", | 138 | "%s Duplex", |
| 139 | port->netdev->name, port->port_speed, | 139 | port->netdev->name, port->port_speed, |
| 140 | port->full_duplex == 1 ? "Full" : "Half"); | 140 | port->full_duplex == 1 ? "Full" : "Half"); |