From b6305d7c9184f5c1aca0db9981513d33bb6852c2 Mon Sep 17 00:00:00 2001
From: Denis Kirjanov <kirjanov@gmail.com>
Date: Sun, 29 Nov 2009 17:04:31 -0800
Subject: [PATCH] --- yaml --- r: 172016 b: refs/heads/master c:
 0ccfe64d3f177a61a071b7a6fa363f0a292158c4 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/mv643xx_eth.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ea4a8cf31d88..1e2499e968e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f64f9e719261a87818dd192a3a2352e5b20fbd0f
+refs/heads/master: 0ccfe64d3f177a61a071b7a6fa363f0a292158c4
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index b62e61d4ca3e..796a493f95ab 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -849,7 +849,7 @@ static int txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)
 	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;