From c5accff17d91f4b7fa8b3c1ea4e8b45f8e361ebd Mon Sep 17 00:00:00 2001
From: Auke Kok <auke\-jan.h.kok@intel.com>
Date: Wed, 27 Sep 2006 12:53:19 -0700
Subject: [PATCH] --- yaml --- r: 37944 b: refs/heads/master c:
 c4e24f01f18f6cea422552caec2fdbf5765a7c7c h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/e1000/e1000_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e9ed5fdcdbbe..6b27fc0a6dde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eb5a34cdf34ad07b6db2df1e523aaf6574601b4
+refs/heads/master: c4e24f01f18f6cea422552caec2fdbf5765a7c7c
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index bd673802e8ce..0aaf9afe31ec 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/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,