diff --git a/[refs] b/[refs]
index a96967141fb3..6202272d69a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffcebb163c6ddba11abd2e8aabc7a8a88982e4f4
+refs/heads/master: 5ad258c0a85a7cc03c46874e8a26c7e9b4dfb90d
diff --git a/trunk/drivers/net/can/vcan.c b/trunk/drivers/net/can/vcan.c
index 103f0f1df280..f127ec983d03 100644
--- a/trunk/drivers/net/can/vcan.c
+++ b/trunk/drivers/net/can/vcan.c
@@ -128,6 +128,10 @@ static int vcan_tx(struct sk_buff *skb, struct net_device *dev)
 	return NETDEV_TX_OK;
 }
 
+static const struct net_device_ops vcan_netdev_ops = {
+	.ndo_start_xmit = vcan_tx,
+};
+
 static void vcan_setup(struct net_device *dev)
 {
 	dev->type              = ARPHRD_CAN;
@@ -141,7 +145,7 @@ static void vcan_setup(struct net_device *dev)
 	if (echo)
 		dev->flags |= IFF_ECHO;
 
-	dev->hard_start_xmit   = vcan_tx;
+	dev->netdev_ops        = &vcan_netdev_ops;
 	dev->destructor        = free_netdev;
 }