Merge branch 'bjorn-start-stop-2.6.32' into release

[mirror_ubuntu-artful-kernel.git] / drivers / net / 3c501.c

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index e29fb1a4a611d5a38acd1f736d4ae8ec2d69fe4b..f60309175ef51e1e84ad0a8db9b365e7d2d5626b 100644 (file)
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -409,7 +409,7 @@ static void el_timeout(struct net_device *dev)
  * no real choice.
  */
 
-static int el_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t el_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct net_local *lp = netdev_priv(dev);
        int ioaddr = dev->base_addr;