---

yaml --- r: 315776 b: refs/heads/master c: e10df2c h: refs/heads/master v: v3
git-mirror · Jul 22, 2012 · ba582f3 · ba582f3
1 parent c209776
commit ba582f3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be53ce1edde13599105c1de88c5bd593d26dfe22
+refs/heads/master: e10df2c63b5500ac32a250bb54f55b764abacf0d
diff --git a/trunk/drivers/net/ethernet/intel/e1000/e1000_ethtool.c b/trunk/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
@@ -1851,6 +1851,7 @@ static const struct ethtool_ops e1000_ethtool_ops = {
 	.get_sset_count         = e1000_get_sset_count,
 	.get_coalesce           = e1000_get_coalesce,
 	.set_coalesce           = e1000_set_coalesce,
+	.get_ts_info		= ethtool_op_get_ts_info,
 };
 
 void e1000_set_ethtool_ops(struct net_device *netdev)