From eb698944c4dca3854adb15b64130ef8b1df3127a Mon Sep 17 00:00:00 2001 From: Giuseppe Cavallaro Date: Sun, 17 Oct 2010 13:43:56 -0700 Subject: [PATCH] --- yaml --- r: 215183 b: refs/heads/master c: f3e85df845a5da60fc461cf49537435b1d07cf6d h: refs/heads/master i: 215181: d13d14060c03399f8275187fadf1570e087b3dfa 215179: c8272abab459fd7fdfda76a31acb6010195cec21 215175: 6c73f6a5825412dbf86e9b31846fa9e919b68c9e 215167: 0d8c891f95e29020e4cda40e6618d0cd816e62ad v: v3 --- [refs] | 2 +- trunk/drivers/net/stmmac/stmmac_ethtool.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 29eac6b93b4b..6242bacc3e98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed440e82fee9652715a8145ffee8f56396017d9a +refs/heads/master: f3e85df845a5da60fc461cf49537435b1d07cf6d diff --git a/trunk/drivers/net/stmmac/stmmac_ethtool.c b/trunk/drivers/net/stmmac/stmmac_ethtool.c index de7589287fb8..6d65482e789a 100644 --- a/trunk/drivers/net/stmmac/stmmac_ethtool.c +++ b/trunk/drivers/net/stmmac/stmmac_ethtool.c @@ -380,10 +380,8 @@ static struct ethtool_ops stmmac_ethtool_ops = { .get_wol = stmmac_get_wol, .set_wol = stmmac_set_wol, .get_sset_count = stmmac_get_sset_count, -#ifdef NETIF_F_TSO .get_tso = ethtool_op_get_tso, .set_tso = ethtool_op_set_tso, -#endif }; void stmmac_set_ethtool_ops(struct net_device *netdev)