[XFS] Fix merge failures

[pandora-kernel.git] / drivers / net / ariadne.c

diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 2903191..e1d72e0 100644 (file)
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -753,7 +753,6 @@ static int ariadne_rx(struct net_device *dev)
 #endif
 
            netif_rx(skb);
-           dev->last_rx = jiffies;
            dev->stats.rx_packets++;
            dev->stats.rx_bytes += pkt_len;
        }