Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  spidernet : fix memory leak in spider_net_stop
  e100: fix napi ifdefs removing needed code
  netxen patches

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 3208dac29168..0cefef5e3f06 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2718,14 +2718,12 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
         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
         del_timer_sync(&nic->watchdog);
         netif_carrier_off(nic->netdev);
-
         netif_device_detach(netdev);
+
         pci_save_state(pdev);
 
         if ((nic->flags & wol_magic) | e100_asf(nic)) {
@@ -2761,16 +2759,13 @@ static int e100_resume(struct pci_dev *pdev)
 }
 #endif /* CONFIG_PM */
 
-
 static void e100_shutdown(struct pci_dev *pdev)
 {
         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
         del_timer_sync(&nic->watchdog);
         netif_carrier_off(nic->netdev);