diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/s2io.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/net/s2io.c')
| -rw-r--r-- | drivers/net/s2io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 0dd7839322bc..cc4218667cba 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -3238,7 +3238,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev) | |||
| 3238 | 3238 | ||
| 3239 | /** | 3239 | /** |
| 3240 | * s2io_chk_xpak_counter - Function to check the status of the xpak counters | 3240 | * s2io_chk_xpak_counter - Function to check the status of the xpak counters |
| 3241 | * @counter : couter value to be updated | 3241 | * @counter : counter value to be updated |
| 3242 | * @flag : flag to indicate the status | 3242 | * @flag : flag to indicate the status |
| 3243 | * @type : counter type | 3243 | * @type : counter type |
| 3244 | * Description: | 3244 | * Description: |