Pull fsys_gettimeofday into release branch

[linux-2.6] / drivers / net / fec_8xx / fec_main.c

diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 8d2904fa57896d33db21f274ca9181fb6f2f828a..ca8d2e83ab036ff174cf2f655d4dd50b08def39b 100644 (file)
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -35,7 +35,7 @@
 #include <asm/mpc8xx.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 
 #include "fec_8xx.h"
 
@@ -476,11 +476,6 @@ static int fec_enet_rx_common(struct fec_enet_private *ep,
        __u16 pkt_len, sc;
        int curidx;
 
-       if (fpi->use_napi) {
-               if (!netif_running(dev))
-                       return 0;
-       }
-
        /*
         * First, grab all of the stats for the incoming packet.
         * These get messed up if we get called due to a busy condition.