diff options
author | Jeff Garzik | 2007-10-24 02:15:05 +0200 |
---|---|---|
committer | Jeff Garzik | 2007-10-24 02:15:05 +0200 |
commit | c7ffb6bb7a1b6fe5912a009d561733911769d32b (patch) | |
tree | 1d81c7707135ac0d7b19777f125113981a0cab89 /drivers | |
parent | Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | mv643xx_eth: Hook up mv643xx_get_sset_count (diff) | |
download | kernel-qcow2-linux-c7ffb6bb7a1b6fe5912a009d561733911769d32b.tar.gz kernel-qcow2-linux-c7ffb6bb7a1b6fe5912a009d561733911769d32b.tar.xz kernel-qcow2-linux-c7ffb6bb7a1b6fe5912a009d561733911769d32b.zip |
Merge branch 'bug-fixes' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
Diffstat (limited to 'drivers')
-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 = { .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, |