From f0407063d7961d8aa61379d931c5dc3d9f8eb573 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Tue, 3 Apr 2012 22:59:29 +0000 Subject: [PATCH] --- yaml --- r: 300479 b: refs/heads/master c: 3bf2ca19a234bbec4f6f5caf2967223b6c0f85d7 h: refs/heads/master i: 300477: 02cc22f3ec74c2e50afa5460968930f0cf0e3da7 300475: 661a10c65dcb88fbfa247d0eae82fcee50fe6153 300471: 38fc73377c5a6e5e1fd2e0503194133ee6c11d61 300463: 186d6e403feaa684fff64dfea474b1191512445e 300447: 0ae254a54740a0c41191bb4a4717b436b7bdf0cd 300415: 815f0fde3473fb585709e613af569d7ea598719d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 32cb4b44309a..ccb43eb917ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec567bcaf893cd82da9d871fc73da44445d50ad8 +refs/heads/master: 3bf2ca19a234bbec4f6f5caf2967223b6c0f85d7 diff --git a/trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c index e4e6cd2c5f82..2b7633f766d9 100644 --- a/trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +++ b/trunk/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c @@ -963,6 +963,7 @@ static const struct ethtool_ops fs_ethtool_ops = { .get_msglevel = fs_get_msglevel, .set_msglevel = fs_set_msglevel, .get_regs = fs_get_regs, + .get_ts_info = ethtool_op_get_ts_info, }; static int fs_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)