projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-drm-fsl-dcu.git]
/
drivers
/
net
/
ethernet
/
intel
/
e1000e
/
netdev.c
diff --git
a/drivers/net/ethernet/intel/e1000e/netdev.c
b/drivers/net/ethernet/intel/e1000e/netdev.c
index 8d3945ab7334840684db42ea6eefa9bafc52c061..c30d41d6e4260d4830c82ccb1dd6b0bcec3bfa1d 100644
(file)
--- a/
drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/
drivers/net/ethernet/intel/e1000e/netdev.c
@@
-6174,7
+6174,7
@@
static int __e1000_resume(struct pci_dev *pdev)
return 0;
}
return 0;
}
-#ifdef CONFIG_PM
_SLEEP
+#ifdef CONFIG_PM
static int e1000_suspend(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
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);
}
return __e1000_resume(pdev);
}
-#endif /* CONFIG_PM
_SLEEP
*/
+#endif /* CONFIG_PM */
#ifdef CONFIG_PM_RUNTIME
static int e1000_runtime_suspend(struct device *dev)
#ifdef CONFIG_PM_RUNTIME
static int e1000_runtime_suspend(struct device *dev)