diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-23 20:15:05 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-23 20:15:05 -0400 |
| commit | c7ffb6bb7a1b6fe5912a009d561733911769d32b (patch) | |
| tree | 1d81c7707135ac0d7b19777f125113981a0cab89 | |
| parent | 43cd73658d8077ee6899b0b5029aad0cba1e9f92 (diff) | |
| parent | 194b2d0e9216dbd3a57fda31440611d515f1dfa2 (diff) | |
Merge branch 'bug-fixes' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 84f2d6382f1e..54e48281c3d4 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
| @@ -2742,6 +2742,7 @@ static const struct ethtool_ops mv643xx_ethtool_ops = { | |||
| 2742 | .get_drvinfo = mv643xx_get_drvinfo, | 2742 | .get_drvinfo = mv643xx_get_drvinfo, |
| 2743 | .get_link = mv643xx_eth_get_link, | 2743 | .get_link = mv643xx_eth_get_link, |
| 2744 | .set_sg = ethtool_op_set_sg, | 2744 | .set_sg = ethtool_op_set_sg, |
| 2745 | .get_sset_count = mv643xx_get_sset_count, | ||
| 2745 | .get_ethtool_stats = mv643xx_get_ethtool_stats, | 2746 | .get_ethtool_stats = mv643xx_get_ethtool_stats, |
| 2746 | .get_strings = mv643xx_get_strings, | 2747 | .get_strings = mv643xx_get_strings, |
| 2747 | .nway_reset = mv643xx_eth_nway_restart, | 2748 | .nway_reset = mv643xx_eth_nway_restart, |