Skip to content

L
linux-davinci
Commit c7ffb6bb authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge branch 'bug-fixes' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream

parents 43cd7365 194b2d0e
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
drivers/net/mv643xx_eth.c
View file @ c7ffb6bb
...@@ -2742,6 +2742,7 @@ static const struct ethtool_ops mv643xx_ethtool_ops = { ...@@ -2742,6 +2742,7 @@ static const struct ethtool_ops mv643xx_ethtool_ops = {
.get_drvinfo = mv643xx_get_drvinfo, .get_drvinfo = mv643xx_get_drvinfo,
.get_link = mv643xx_eth_get_link, .get_link = mv643xx_eth_get_link,
.set_sg = ethtool_op_set_sg, .set_sg = ethtool_op_set_sg,
.get_sset_count = mv643xx_get_sset_count,
.get_ethtool_stats = mv643xx_get_ethtool_stats, .get_ethtool_stats = mv643xx_get_ethtool_stats,
.get_strings = mv643xx_get_strings, .get_strings = mv643xx_get_strings,
.nway_reset = mv643xx_eth_nway_restart, .nway_reset = mv643xx_eth_nway_restart,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment