diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 18:49:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 18:49:37 -0500 |
| commit | f327220b1494aa23fd4206ac4778b8aa449a3351 (patch) | |
| tree | b463d2541db1638c7cb8b9ff10a9238fc8a47000 /drivers/net/sk98lin/skethtool.c | |
| parent | 31b3c31bca3b4df975631323d6ee6f49f43f4956 (diff) | |
| parent | ea182d4aefa3a27847d890b1592a608d1180aa45 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/sk98lin/skethtool.c')
| -rw-r--r-- | drivers/net/sk98lin/skethtool.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c index fb639959292b..b71769ae4603 100644 --- a/drivers/net/sk98lin/skethtool.c +++ b/drivers/net/sk98lin/skethtool.c | |||
| @@ -549,4 +549,6 @@ struct ethtool_ops SkGeEthtoolOps = { | |||
| 549 | .phys_id = locateDevice, | 549 | .phys_id = locateDevice, |
| 550 | .get_pauseparam = getPauseParams, | 550 | .get_pauseparam = getPauseParams, |
| 551 | .set_pauseparam = setPauseParams, | 551 | .set_pauseparam = setPauseParams, |
| 552 | .get_link = ethtool_op_get_link, | ||
| 553 | .get_perm_addr = ethtool_op_get_perm_addr, | ||
| 552 | }; | 554 | }; |