summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 16:34:57 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-04 16:34:57 -0800
commit52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch)
treed956016f7aefff1030ca0f7885ac6a6f890a9e94 /drivers/net
parent1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (diff)
parent48d727a9f93e617d6d443507acf7d1b849c63366 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tlan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 942fae0f2130..c2506b56a186 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -2865,11 +2865,11 @@ void TLan_PhyMonitor( struct net_device *dev )
* for this device.
* phy The address of the PHY to be queried.
* reg The register whose contents are to be
- * retreived.
+ * retrieved.
* val A pointer to a variable to store the
* retrieved value.
*
- * This function uses the TLAN's MII bus to retreive the contents
+ * This function uses the TLAN's MII bus to retrieve the contents
* of a given register on a PHY. It sends the appropriate info
* and then reads the 16-bit register value from the MII bus via
* the TLAN SIO register.