aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sk98lin/skethtool.c
diff options
context:
space:
mode:
authorJody McIntyre <scjody@modernduck.com>2005-12-05 15:52:41 -0500
committerJody McIntyre <scjody@modernduck.com>2005-12-05 15:52:41 -0500
commitc4fc108a8275f5eb77c9859725643a6870d20ef6 (patch)
treede7ce4af8e49ad2504fc270594124ec8ec874857 /drivers/net/sk98lin/skethtool.c
parent741854e4f9a23421e194df8d846899172ff393d6 (diff)
parente4f5c82a92c2a546a16af1614114eec19120e40a (diff)
downloadkernel_samsung_smdk4412-c4fc108a8275f5eb77c9859725643a6870d20ef6.tar.gz
kernel_samsung_smdk4412-c4fc108a8275f5eb77c9859725643a6870d20ef6.tar.bz2
kernel_samsung_smdk4412-c4fc108a8275f5eb77c9859725643a6870d20ef6.zip
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/sk98lin/skethtool.c')
-rw-r--r--drivers/net/sk98lin/skethtool.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c
index fb639959292..b71769ae460 100644
--- a/drivers/net/sk98lin/skethtool.c
+++ b/drivers/net/sk98lin/skethtool.c
@@ -549,4 +549,6 @@ struct ethtool_ops SkGeEthtoolOps = {
.phys_id = locateDevice,
.get_pauseparam = getPauseParams,
.set_pauseparam = setPauseParams,
+ .get_link = ethtool_op_get_link,
+ .get_perm_addr = ethtool_op_get_perm_addr,
};