From 842db89ca7156288f9343c0eb5b5f0b24b978cb2 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Tue, 3 Apr 2012 22:59:33 +0000 Subject: [PATCH] --- yaml --- r: 300483 b: refs/heads/master c: 1975a54b56aceefb5b3e4ea92b04dd7d298bf01f h: refs/heads/master i: 300481: 37c9c4390b18472fbe30c364a8abb75f279491da 300479: f0407063d7961d8aa61379d931c5dc3d9f8eb573 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/marvell/pxa168_eth.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3789c6196b57..8a56de49d114 100644 --- 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 index 45a6333588e6..44bad608eed7 100644 --- 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 = {