Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 300481
b: refs/heads/master
c: 17f393e
h: refs/heads/master
i:
  300479: f040706
v: v3
  • Loading branch information
Richard Cochran authored and David S. Miller committed Apr 4, 2012
1 parent 08c86f1 commit 37c9c43
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f85e5ea28f5c1d31b22ae5777a1a08ebd76ff7e1
refs/heads/master: 17f393e89a14bb5f27feb0c789534ac526200e31
1 change: 1 addition & 0 deletions trunk/drivers/net/ethernet/cadence/macb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 37c9c43

Please sign in to comment.