Skip to content

Commit

Permalink
Merge branch 'bug-fixes' of git://farnsworth.org/dale/linux-2.6-mv643…
Browse files Browse the repository at this point in the history
…xx_eth into upstream
  • Loading branch information
Jeff Garzik committed Oct 24, 2007
2 parents 43cd736 + 194b2d0 commit c7ffb6b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/net/mv643xx_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -2742,6 +2742,7 @@ static const struct ethtool_ops mv643xx_ethtool_ops = {
.get_drvinfo = mv643xx_get_drvinfo,
.get_link = mv643xx_eth_get_link,
.set_sg = ethtool_op_set_sg,
.get_sset_count = mv643xx_get_sset_count,
.get_ethtool_stats = mv643xx_get_ethtool_stats,
.get_strings = mv643xx_get_strings,
.nway_reset = mv643xx_eth_nway_restart,
Expand Down

0 comments on commit c7ffb6b

Please sign in to comment.