--- zzzz-none-000/linux-2.6.19.2/drivers/net/e100.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/net/e100.c	2007-01-11 07:38:19.000000000 +0000
@@ -2719,10 +2719,7 @@
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct nic *nic = netdev_priv(netdev);
 
-#ifdef CONFIG_E100_NAPI
-	if (netif_running(netdev))
-		netif_poll_disable(nic->netdev);
-#endif
+	netif_poll_disable(nic->netdev);
 	del_timer_sync(&nic->watchdog);
 	netif_carrier_off(nic->netdev);
 
@@ -2766,10 +2763,7 @@
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct nic *nic = netdev_priv(netdev);
 
-#ifdef CONFIG_E100_NAPI
-	if (netif_running(netdev))
-		netif_poll_disable(nic->netdev);
-#endif
+	netif_poll_disable(nic->netdev);
 	del_timer_sync(&nic->watchdog);
 	netif_carrier_off(nic->netdev);