From: Auke Kok <auke\-jan.h.kok@intel.com>
Date: Wed, 27 Sep 2006 19:53:19 +0000 (-0700)
Subject: e1000: keep .suspend and .resume driver methods in CONFIG_PM
X-Git-Tag: v2.6.19-rc1~372^2~5^2~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4e24f01f18f6cea422552caec2fdbf5765a7c7c;p=linux-2.6

e1000: keep .suspend and .resume driver methods in CONFIG_PM

Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index bd673802e8..0aaf9afe31 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,