diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/xilinx_emaclite.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
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, |