|
@@ -6174,7 +6174,7 @@ static int __e1000_resume(struct pci_dev *pdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_PM
|
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
|
static int e1000_suspend(struct device *dev)
|
|
|
{
|
|
|
struct pci_dev *pdev = to_pci_dev(dev);
|
|
@@ -6193,7 +6193,7 @@ static int e1000_resume(struct device *dev)
|
|
|
|
|
|
return __e1000_resume(pdev);
|
|
|
}
|
|
|
-#endif /* CONFIG_PM */
|
|
|
+#endif /* CONFIG_PM_SLEEP */
|
|
|
|
|
|
#ifdef CONFIG_PM_RUNTIME
|
|
|
static int e1000_runtime_suspend(struct device *dev)
|
|
@@ -7015,13 +7015,11 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
|
|
|
};
|
|
|
MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
|
|
|
|
|
|
-#ifdef CONFIG_PM
|
|
|
static const struct dev_pm_ops e1000_pm_ops = {
|
|
|
SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume)
|
|
|
SET_RUNTIME_PM_OPS(e1000_runtime_suspend, e1000_runtime_resume,
|
|
|
e1000_idle)
|
|
|
};
|
|
|
-#endif
|
|
|
|
|
|
/* PCI Device API Driver */
|
|
|
static struct pci_driver e1000_driver = {
|
|
@@ -7029,11 +7027,9 @@ static struct pci_driver e1000_driver = {
|
|
|
.id_table = e1000_pci_tbl,
|
|
|
.probe = e1000_probe,
|
|
|
.remove = e1000_remove,
|
|
|
-#ifdef CONFIG_PM
|
|
|
.driver = {
|
|
|
.pm = &e1000_pm_ops,
|
|
|
},
|
|
|
-#endif
|
|
|
.shutdown = e1000_shutdown,
|
|
|
.err_handler = &e1000_err_handler
|
|
|
};
|