Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[deliverable/linux.git] / net / dsa / slave.c

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 64ca2a6fa0d4449f58c9befbdcbd4d8c31b3cdb0..0a47b6c37038b5f6c12a918789497a6609686fb0 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -288,7 +288,6 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
        .get_drvinfo            = dsa_slave_get_drvinfo,
        .nway_reset             = dsa_slave_nway_reset,
        .get_link               = dsa_slave_get_link,
-       .set_sg                 = ethtool_op_set_sg,
        .get_strings            = dsa_slave_get_strings,
        .get_ethtool_stats      = dsa_slave_get_ethtool_stats,
        .get_sset_count         = dsa_slave_get_sset_count,