aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000e
diff options
context:
space:
mode:
authorKevin Hao <haokexin@gmail.com>2014-03-18 03:26:49 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-18 13:25:41 -0400
commit72f72dcc146fd7c4f9a8544626b961d52f1399b3 (patch)
tree351ecd0d3a69a3ba4c96933e35dfc601852c41a3 /drivers/net/ethernet/intel/e1000e
parent406d49656f80b1e6d37d67e187a640243ed87ba9 (diff)
e1000e: fix the build error when PM is disabled
The commit 2800209994f8 (e1000e: Refactor PM flows) changed the SET_SYSTEM_SLEEP_PM_OPS to open-coded assignment, but forgot to protect them with CONFIG_PM_SLEEP. Then cause the following build error when PM is disabled: drivers/net/ethernet/intel/e1000e/netdev.c:7079:13: error: 'e1000e_pm_suspend' undeclared here (not in a function) .suspend = e1000e_pm_suspend, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7080:13: error: 'e1000e_pm_resume' undeclared here (not in a function) .resume = e1000e_pm_resume, ^ drivers/net/ethernet/intel/e1000e/netdev.c:7082:11: error: 'e1000e_pm_thaw' undeclared here (not in a function) .thaw = e1000e_pm_thaw, ^ Signed-off-by: Kevin Hao <haokexin@gmail.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 3f044e736de8..eafad410e59a 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -7076,12 +7076,14 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
7076MODULE_DEVICE_TABLE(pci, e1000_pci_tbl); 7076MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
7077 7077
7078static const struct dev_pm_ops e1000_pm_ops = { 7078static const struct dev_pm_ops e1000_pm_ops = {
7079#ifdef CONFIG_PM_SLEEP
7079 .suspend = e1000e_pm_suspend, 7080 .suspend = e1000e_pm_suspend,
7080 .resume = e1000e_pm_resume, 7081 .resume = e1000e_pm_resume,
7081 .freeze = e1000e_pm_freeze, 7082 .freeze = e1000e_pm_freeze,
7082 .thaw = e1000e_pm_thaw, 7083 .thaw = e1000e_pm_thaw,
7083 .poweroff = e1000e_pm_suspend, 7084 .poweroff = e1000e_pm_suspend,
7084 .restore = e1000e_pm_resume, 7085 .restore = e1000e_pm_resume,
7086#endif
7085 SET_RUNTIME_PM_OPS(e1000e_pm_runtime_suspend, e1000e_pm_runtime_resume, 7087 SET_RUNTIME_PM_OPS(e1000e_pm_runtime_suspend, e1000e_pm_runtime_resume,
7086 e1000e_pm_runtime_idle) 7088 e1000e_pm_runtime_idle)
7087}; 7089};