]> git.baikalelectronics.ru Git - kernel.git/commit
e1000e: Fix a compile flag mis-match for suspend/resume
authorDavid Ertman <davidx.m.ertman@intel.com>
Tue, 17 Dec 2013 04:42:42 +0000 (04:42 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 18 Dec 2013 06:45:03 +0000 (22:45 -0800)
commit8e3b847f15e2f4e076a573b5aa6ccae661890362
treefc5226715c2f45b79a6b505d083cc6b87727cd02
parent6d075b1de9463cb7db551ef9b57db3e7020b116a
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>
drivers/net/ethernet/intel/e1000e/netdev.c