From 37c9c4390b18472fbe30c364a8abb75f279491da Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Tue, 3 Apr 2012 22:59:31 +0000 Subject: [PATCH] --- yaml --- r: 300481 b: refs/heads/master c: 17f393e89a14bb5f27feb0c789534ac526200e31 h: refs/heads/master i: 300479: f0407063d7961d8aa61379d931c5dc3d9f8eb573 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/cadence/macb.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6fc8edace0d0..80df26006cf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f85e5ea28f5c1d31b22ae5777a1a08ebd76ff7e1 +refs/heads/master: 17f393e89a14bb5f27feb0c789534ac526200e31 diff --git a/trunk/drivers/net/ethernet/cadence/macb.c b/trunk/drivers/net/ethernet/cadence/macb.c index c4834c23be35..1466bc4e3dda 100644 --- a/trunk/drivers/net/ethernet/cadence/macb.c +++ b/trunk/drivers/net/ethernet/cadence/macb.c @@ -1213,6 +1213,7 @@ static const struct ethtool_ops macb_ethtool_ops = { .set_settings = macb_set_settings, .get_drvinfo = macb_get_drvinfo, .get_link = ethtool_op_get_link, + .get_ts_info = ethtool_op_get_ts_info, }; static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)