diff --git a/[refs] b/[refs]
index 4923e70909c9..da55776f61f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 245acb87729bc76ba65c7476665c01837e0cdccb
+refs/heads/master: 6a9b6546164fb380a019f92ca4d76443202fdc4f
diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c
index 58afafbd3b9c..fd5e32cbcb87 100644
--- a/trunk/drivers/net/cpmac.c
+++ b/trunk/drivers/net/cpmac.c
@@ -1097,7 +1097,7 @@ static const struct net_device_ops cpmac_netdev_ops = {
 	.ndo_start_xmit		= cpmac_start_xmit,
 	.ndo_tx_timeout		= cpmac_tx_timeout,
 	.ndo_set_multicast_list	= cpmac_set_multicast_list,
-	.ndo_so_ioctl		= cpmac_ioctl,
+	.ndo_do_ioctl		= cpmac_ioctl,
 	.ndo_set_config		= cpmac_config,
 	.ndo_change_mtu		= eth_change_mtu,
 	.ndo_validate_addr	= eth_validate_addr,