diff --git a/[refs] b/[refs] index be3ae36aa1d8..0c76e8d0fb91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 019d077a530d2c6d6032ddd92a91520c3479ff05 +refs/heads/master: 2f6f9d6fe533b59b389103d669c9bab78584960a diff --git a/trunk/drivers/net/ethernet/fealnx.c b/trunk/drivers/net/ethernet/fealnx.c index 6f939a1e1568..9d71c9cc300b 100644 --- a/trunk/drivers/net/ethernet/fealnx.c +++ b/trunk/drivers/net/ethernet/fealnx.c @@ -923,7 +923,6 @@ static int netdev_open(struct net_device *dev) np->reset_timer.data = (unsigned long) dev; np->reset_timer.function = reset_timer; np->reset_timer_armed = 0; -out: return rc; }