diff --git a/[refs] b/[refs]
index 15880433d71a..8b1c721efdcc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b07be4b2a78166bc54c8eedf18da8a8aafacfab
+refs/heads/master: bd601cc464e1ddc041d07ba2e4c015cdb9e392ec
diff --git a/trunk/drivers/net/ethernet/calxeda/xgmac.c b/trunk/drivers/net/ethernet/calxeda/xgmac.c
index 107c1b010806..1fce186a9031 100644
--- a/trunk/drivers/net/ethernet/calxeda/xgmac.c
+++ b/trunk/drivers/net/ethernet/calxeda/xgmac.c
@@ -1440,7 +1440,7 @@ static void xgmac_poll_controller(struct net_device *dev)
 }
 #endif
 
-struct rtnl_link_stats64 *
+static struct rtnl_link_stats64 *
 xgmac_get_stats64(struct net_device *dev,
 		       struct rtnl_link_stats64 *storage)
 {
@@ -1675,7 +1675,7 @@ static int xgmac_set_wol(struct net_device *dev,
 	return 0;
 }
 
-static struct ethtool_ops xgmac_ethtool_ops = {
+static const struct ethtool_ops xgmac_ethtool_ops = {
 	.get_settings = xgmac_ethtool_getsettings,
 	.get_link = ethtool_op_get_link,
 	.get_pauseparam = xgmac_get_pauseparam,