git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
8390
/
ax88796.c
diff --git
a/drivers/net/ethernet/8390/ax88796.c
b/drivers/net/ethernet/8390/ax88796.c
index 11476ca95e93978b4e60e9108d3805a8e4797ab0..203ff9dccadb03206a20f96ea1e71437a98be3be 100644
(file)
--- a/
drivers/net/ethernet/8390/ax88796.c
+++ b/
drivers/net/ethernet/8390/ax88796.c
@@
-501,6
+501,7
@@
static const struct ethtool_ops ax_ethtool_ops = {
.get_settings = ax_get_settings,
.set_settings = ax_set_settings,
.get_link = ethtool_op_get_link,
+ .get_ts_info = ethtool_op_get_ts_info,
};
#ifdef CONFIG_AX88796_93CX6