Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6] / drivers / net / ucc_geth.c

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 4e188f4289b4b2787f003644e055de8923b69583..700ebd7d145751cefd9b08c2592b3cd5b6f84f4d 100644 (file)
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -4129,20 +4129,7 @@ static int ucc_geth_close(struct net_device *dev)
        return 0;
 }
 
-struct ethtool_ops ucc_geth_ethtool_ops = {
-       .get_settings = NULL,
-       .get_drvinfo = NULL,
-       .get_regs_len = NULL,
-       .get_regs = NULL,
-       .get_link = NULL,
-       .get_coalesce = NULL,
-       .set_coalesce = NULL,
-       .get_ringparam = NULL,
-       .set_ringparam = NULL,
-       .get_strings = NULL,
-       .get_stats_count = NULL,
-       .get_ethtool_stats = NULL,
-};
+const struct ethtool_ops ucc_geth_ethtool_ops = { };
 
 static int ucc_geth_probe(struct device *device)
 {