---

yaml --- r: 300483 b: refs/heads/master c: 1975a54 h: refs/heads/master i: 300481: 37c9c43 300479: f040706 v: v3
git-mirror · Apr 4, 2012 · 842db89 · 842db89
1 parent 2d2350b
commit 842db89
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: ebad0a8d504f31a76c22f029b9fe4af7f9504f55
+refs/heads/master: 1975a54b56aceefb5b3e4ea92b04dd7d298bf01f
diff --git a/trunk/drivers/net/ethernet/marvell/pxa168_eth.c b/trunk/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1457,6 +1457,7 @@ static const struct ethtool_ops pxa168_ethtool_ops = {
 	.set_settings = pxa168_set_settings,
 	.get_drvinfo = pxa168_get_drvinfo,
 	.get_link = ethtool_op_get_link,
+	.get_ts_info = ethtool_op_get_ts_info,
 };
 
 static const struct net_device_ops pxa168_eth_netdev_ops = {