diff options
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 2e5022849f18..6d513a383340 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -5338,7 +5338,7 @@ void e1000e_disable_aspm(struct pci_dev *pdev, u16 state) | |||
5338 | __e1000e_disable_aspm(pdev, state); | 5338 | __e1000e_disable_aspm(pdev, state); |
5339 | } | 5339 | } |
5340 | 5340 | ||
5341 | #ifdef CONFIG_PM_OPS | 5341 | #ifdef CONFIG_PM |
5342 | static bool e1000e_pm_ready(struct e1000_adapter *adapter) | 5342 | static bool e1000e_pm_ready(struct e1000_adapter *adapter) |
5343 | { | 5343 | { |
5344 | return !!adapter->tx_ring->buffer_info; | 5344 | return !!adapter->tx_ring->buffer_info; |
@@ -5489,7 +5489,7 @@ static int e1000_runtime_resume(struct device *dev) | |||
5489 | return __e1000_resume(pdev); | 5489 | return __e1000_resume(pdev); |
5490 | } | 5490 | } |
5491 | #endif /* CONFIG_PM_RUNTIME */ | 5491 | #endif /* CONFIG_PM_RUNTIME */ |
5492 | #endif /* CONFIG_PM_OPS */ | 5492 | #endif /* CONFIG_PM */ |
5493 | 5493 | ||
5494 | static void e1000_shutdown(struct pci_dev *pdev) | 5494 | static void e1000_shutdown(struct pci_dev *pdev) |
5495 | { | 5495 | { |
@@ -6196,7 +6196,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = { | |||
6196 | }; | 6196 | }; |
6197 | MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); | 6197 | MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); |
6198 | 6198 | ||
6199 | #ifdef CONFIG_PM_OPS | 6199 | #ifdef CONFIG_PM |
6200 | static const struct dev_pm_ops e1000_pm_ops = { | 6200 | static const struct dev_pm_ops e1000_pm_ops = { |
6201 | SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume) | 6201 | SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume) |
6202 | SET_RUNTIME_PM_OPS(e1000_runtime_suspend, | 6202 | SET_RUNTIME_PM_OPS(e1000_runtime_suspend, |
@@ -6210,7 +6210,7 @@ static struct pci_driver e1000_driver = { | |||
6210 | .id_table = e1000_pci_tbl, | 6210 | .id_table = e1000_pci_tbl, |
6211 | .probe = e1000_probe, | 6211 | .probe = e1000_probe, |
6212 | .remove = __devexit_p(e1000_remove), | 6212 | .remove = __devexit_p(e1000_remove), |
6213 | #ifdef CONFIG_PM_OPS | 6213 | #ifdef CONFIG_PM |
6214 | .driver.pm = &e1000_pm_ops, | 6214 | .driver.pm = &e1000_pm_ops, |
6215 | #endif | 6215 | #endif |
6216 | .shutdown = e1000_shutdown, | 6216 | .shutdown = e1000_shutdown, |