diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/net/tlan.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/net/tlan.c')
| -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. |