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);