diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/net/xilinx_emaclite.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/net/xilinx_emaclite.c')
| -rw-r--r-- | drivers/net/xilinx_emaclite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 2642af4ee491..372572c0adc6 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c | |||
| @@ -786,7 +786,7 @@ static int xemaclite_mdio_read(struct mii_bus *bus, int phy_id, int reg) | |||
| 786 | * @reg: register number to write to | 786 | * @reg: register number to write to |
| 787 | * @val: value to write to the register number specified by reg | 787 | * @val: value to write to the register number specified by reg |
| 788 | * | 788 | * |
| 789 | * This fucntion waits till the device is ready to accept a new MDIO | 789 | * This function waits till the device is ready to accept a new MDIO |
| 790 | * request and then writes the val to the MDIO Write Data register. | 790 | * request and then writes the val to the MDIO Write Data register. |
| 791 | */ | 791 | */ |
| 792 | static int xemaclite_mdio_write(struct mii_bus *bus, int phy_id, int reg, | 792 | static int xemaclite_mdio_write(struct mii_bus *bus, int phy_id, int reg, |