diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 19:34:57 -0500 |
| commit | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (patch) | |
| tree | d956016f7aefff1030ca0f7885ac6a6f890a9e94 /drivers/net | |
| parent | 1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (diff) | |
| parent | 48d727a9f93e617d6d443507acf7d1b849c63366 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tlan.c | 4 |
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 ) | |||
| 2865 | * for this device. | 2865 | * for this device. |
| 2866 | * phy The address of the PHY to be queried. | 2866 | * phy The address of the PHY to be queried. |
| 2867 | * reg The register whose contents are to be | 2867 | * reg The register whose contents are to be |
| 2868 | * retreived. | 2868 | * retrieved. |
| 2869 | * val A pointer to a variable to store the | 2869 | * val A pointer to a variable to store the |
| 2870 | * retrieved value. | 2870 | * retrieved value. |
| 2871 | * | 2871 | * |
| 2872 | * This function uses the TLAN's MII bus to retreive the contents | 2872 | * This function uses the TLAN's MII bus to retrieve the contents |
| 2873 | * of a given register on a PHY. It sends the appropriate info | 2873 | * of a given register on a PHY. It sends the appropriate info |
| 2874 | * and then reads the 16-bit register value from the MII bus via | 2874 | * and then reads the 16-bit register value from the MII bus via |
| 2875 | * the TLAN SIO register. | 2875 | * the TLAN SIO register. |