Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...

[safe/jmp/linux-2.6] / drivers / net / atl1e / atl1e_ethtool.c

diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c
index bb15c51..a76006c 100644 (file)
--- a/drivers/net/atl1e/atl1e_ethtool.c
+++ b/drivers/net/atl1e/atl1e_ethtool.c
@@ -140,10 +140,6 @@ static u32 atl1e_get_msglevel(struct net_device *netdev)
 #endif
 }
 
-static void atl1e_set_msglevel(struct net_device *netdev, u32 data)
-{
-}
-
 static int atl1e_get_regs_len(struct net_device *netdev)
 {
        return AT_REGS_LEN * sizeof(u32);
@@ -382,7 +378,6 @@ static const struct ethtool_ops atl1e_ethtool_ops = {
        .get_wol                = atl1e_get_wol,
        .set_wol                = atl1e_set_wol,
        .get_msglevel           = atl1e_get_msglevel,
-       .set_msglevel           = atl1e_set_msglevel,
        .nway_reset             = atl1e_nway_reset,
        .get_link               = ethtool_op_get_link,
        .get_eeprom_len         = atl1e_get_eeprom_len,