From be26499749ad38005fdd5cc91c330d7d33ffe6f0 Mon Sep 17 00:00:00 2001
From: Denis Kirjanov <dkirjanov@hera.kernel.org>
Date: Wed, 2 Jun 2010 09:15:47 +0000
Subject: [PATCH] --- yaml --- r: 202657 b: refs/heads/master c:
 c7621cb3d9a2c42d2fed7e16845611c8c6fd5835 h: refs/heads/master i:   202655:
 d76163caadfcdf08fdacfff31821b60b6b88dc5a v: v3

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

diff --git a/[refs] b/[refs]
index b8acbd2d4b86..d4213b6603de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e364e9668ceb5094622144ef4c931305329c175
+refs/heads/master: c7621cb3d9a2c42d2fed7e16845611c8c6fd5835
diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c
index ddf7a86cd466..b896f686ab34 100644
--- a/trunk/drivers/net/fec.c
+++ b/trunk/drivers/net/fec.c
@@ -210,7 +210,7 @@ static void fec_stop(struct net_device *dev);
 /* Transmitter timeout */
 #define TX_TIMEOUT (2 * HZ)
 
-static int
+static netdev_tx_t
 fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct fec_enet_private *fep = netdev_priv(dev);