aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/e1000/e1000_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 813d5e0e458d..7cf5e5dce0da 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -177,8 +177,8 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
177static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid); 177static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
178static void e1000_restore_vlan(struct e1000_adapter *adapter); 178static void e1000_restore_vlan(struct e1000_adapter *adapter);
179 179
180#ifdef CONFIG_PM
181static int e1000_suspend(struct pci_dev *pdev, pm_message_t state); 180static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
181#ifdef CONFIG_PM
182static int e1000_resume(struct pci_dev *pdev); 182static int e1000_resume(struct pci_dev *pdev);
183#endif 183#endif
184static void e1000_shutdown(struct pci_dev *pdev); 184static void e1000_shutdown(struct pci_dev *pdev);
@@ -205,8 +205,8 @@ static struct pci_driver e1000_driver = {
205 .probe = e1000_probe, 205 .probe = e1000_probe,
206 .remove = __devexit_p(e1000_remove), 206 .remove = __devexit_p(e1000_remove),
207 /* Power Managment Hooks */ 207 /* Power Managment Hooks */
208#ifdef CONFIG_PM
209 .suspend = e1000_suspend, 208 .suspend = e1000_suspend,
209#ifdef CONFIG_PM
210 .resume = e1000_resume, 210 .resume = e1000_resume,
211#endif 211#endif
212 .shutdown = e1000_shutdown, 212 .shutdown = e1000_shutdown,
@@ -4498,7 +4498,9 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
4498 struct e1000_adapter *adapter = netdev_priv(netdev); 4498 struct e1000_adapter *adapter = netdev_priv(netdev);
4499 uint32_t ctrl, ctrl_ext, rctl, manc, status; 4499 uint32_t ctrl, ctrl_ext, rctl, manc, status;
4500 uint32_t wufc = adapter->wol; 4500 uint32_t wufc = adapter->wol;
4501#ifdef CONFIG_PM
4501 int retval = 0; 4502 int retval = 0;
4503#endif
4502 4504
4503 netif_device_detach(netdev); 4505 netif_device_detach(netdev);
4504 4506