Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7ffb6bb authored by Jeff Garzik's avatar Jeff Garzik
Browse files

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

parents 43cd7365 194b2d0e

drivers/net/mv643xx_eth.c

+1 −0
Original line number Diff line number Diff line
@@ -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,