From: Denis Kirjanov <kirjanov@gmail.com>
Date: Mon, 30 Nov 2009 01:04:31 +0000 (-0800)
Subject: mv643xx: convert to netdev_tx_t
X-Git-Tag: v2.6.33-rc1~388^2~141
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0ccfe64d3f177a61a071b7a6fa363f0a292158c4;p=~emulex%2Finfiniband.git

mv643xx: convert to netdev_tx_t

Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index b62e61d4ca3..796a493f95a 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -849,7 +849,7 @@ no_csum:
 	return 0;
 }
 
-static int mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t mv643xx_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct mv643xx_eth_private *mp = netdev_priv(dev);
 	int queue;