Please pull bug-fixes branch of linux-2.6-mv643xx_eth.git

Please pull bug-fixes branch of linux-2.6-mv643xx_eth.git

[Dale Farnsworth]

The following changes since commit e8b8c977734193adedf2b0f607d6252c78e86394:
  Linus Torvalds (1):
        Revert "kconfig: tristate choices with mixed tristate and boolean values"

are available in the git repository at:

  git://farnsworth.org/dale/linux-2.6-mv643xx_eth.git bug-fixes

Dale Farnsworth (1):
      mv643xx_eth: Hook up mv643xx_get_sset_count

 drivers/net/mv643xx_eth.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

It may be also viewed at:
http://www.farnsworth.org/git?p=dale/linux-2.6-mv643xx_eth.git;a=shortlog;h=bug-fixes

Thanks,
-Dale

Here is the single commit:

Author: Dale Farnsworth <dale@farnsworth.org>
Date:   Sat Oct 20 12:16:27 2007 -0700

    mv643xx_eth: Hook up mv643xx_get_sset_count
    
    Commit b9f2c044 replaced mv643xx_get_stats_count() with
    mv643xx_get_sset_count(), but forgot to hook it up.
    
    drivers/net/mv643xx_eth.c:2678: warning: mv643xx_get_sset_count defined but not used
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 84f2d63..54e4828 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,

Re: Please pull bug-fixes branch of linux-2.6-mv643xx_eth.git

[Jeff Garzik]

Dale Farnsworth wrote:
> The following changes since commit e8b8c977734193adedf2b0f607d6252c78e86394:
>   Linus Torvalds (1):
>         Revert "kconfig: tristate choices with mixed tristate and boolean values"
> 
> are available in the git repository at:
> 
>   git://farnsworth.org/dale/linux-2.6-mv643xx_eth.git bug-fixes

pulled