Commit 7509963c authored Dec 17, 2013 by David Ertman Committed by Jeff Kirsher Dec 17, 2013

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: Dave Ertman <davidx.m.ertman@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 918a4308

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -6174,7 +6174,7 @@ static int __e1000_resume(struct pci_dev *pdev)
		return 0;
		}

		#ifdef CONFIG_PM_SLEEP
		#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 */

		#ifdef CONFIG_PM_RUNTIME
		static int e1000_runtime_suspend(struct device *dev)