Commit 7509963c authored by David Ertman's avatar David Ertman Committed by Jeff Kirsher
Browse files

e1000e: Fix a compile flag mis-match for suspend/resume

This patch addresses a mis-match between the declaration and usage of
the e1000_suspend and e1000_resume functions.  Previously, these
functions were declared in a CONFIG_PM_SLEEP wrapper, and then utilized
within a CONFIG_PM wrapper.  Both the declaration and usage will now be
contained within CONFIG_PM wrappers.
Signed-off-by: default avatarDave Ertman <>
Tested-by: default avatarAaron Brown <>
Signed-off-by: default avatarJeff Kirsher <>
parent 918a4308
......@@ -6174,7 +6174,7 @@ static int __e1000_resume(struct pci_dev *pdev)
return 0;
#ifdef CONFIG_PM
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_SLEEP */
#endif /* CONFIG_PM */
static int e1000_runtime_suspend(struct device *dev)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment