aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ehea
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:43:33 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:43:33 -0500
commit4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch)
tree856ba96302a36014736747e8464f80eeb827bbdd /drivers/net/ehea
parentf6c4c8195b5e7878823caa1181be404d9e86d369 (diff)
parentd014d043869cdc591f3a33243d3481fa4479c2d0 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits) tree-wide: fix misspelling of "definition" in comments reiserfs: fix misspelling of "journaled" doc: Fix a typo in slub.txt. inotify: remove superfluous return code check hdlc: spelling fix in find_pvc() comment doc: fix regulator docs cut-and-pasteism mtd: Fix comment in Kconfig doc: Fix IRQ chip docs tree-wide: fix assorted typos all over the place drivers/ata/libata-sff.c: comment spelling fixes fix typos/grammos in Documentation/edac.txt sysctl: add missing comments fs/debugfs/inode.c: fix comment typos sgivwfb: Make use of ARRAY_SIZE. sky2: fix sky2_link_down copy/paste comment error tree-wide: fix typos "couter" -> "counter" tree-wide: fix typos "offest" -> "offset" fix kerneldoc for set_irq_msi() spidev: fix double "of of" in comment comment typo fix: sybsystem -> subsystem ...
Diffstat (limited to 'drivers/net/ehea')
-rw-r--r--drivers/net/ehea/ehea_ethtool.c4
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");