aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAuke Kok <auke\-jan.h.kok@intel.com>2006-09-27 12:53:19 -0700
committerAuke Kok <juke-jan.h.kok@intel.com>2006-09-27 12:53:19 -0700
commitc4e24f01f18f6cea422552caec2fdbf5765a7c7c (patch)
treebb4277f21ce10c59fdf3270c870806bcc747c7dc /drivers
parent0eb5a34cdf34ad07b6db2df1e523aaf6574601b4 (diff)
downloadlinux-c4e24f01f18f6cea422552caec2fdbf5765a7c7c.tar.gz
e1000: keep .suspend and .resume driver methods in CONFIG_PM
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/e1000/e1000_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index bd673802e8ce1a..0aaf9afe31ec35 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -211,9 +211,9 @@ static struct pci_driver e1000_driver = {
.id_table = e1000_pci_tbl,
.probe = e1000_probe,
.remove = __devexit_p(e1000_remove),
+#ifdef CONFIG_PM
/* Power Managment Hooks */
.suspend = e1000_suspend,
-#ifdef CONFIG_PM
.resume = e1000_resume,
#endif
.shutdown = e1000_shutdown,