From 050d002e67272556d91b6545a0ce1394fe80cf02 Mon Sep 17 00:00:00 2001
From: "Martin J. Bligh" <mbligh@mbligh.org>
Date: Fri, 28 Oct 2005 15:14:44 -0700
Subject: [PATCH] --- yaml --- r: 10941 b: refs/heads/master c:
 b6a1d5f88473138497d8694ddf174e8e91300068 h: refs/heads/master i:   10939:
 70e82a3110245f661cbb62c039c5ed0f6aeb5d52 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 d34a5c0ef9fe..c05669067244 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 596c96ba06e5d56e72451e02f93f4e15e17458df
+refs/heads/master: b6a1d5f88473138497d8694ddf174e8e91300068
diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c
index 6b72f6acdd54..a0023f357cb1 100644
--- a/trunk/drivers/net/e1000/e1000_main.c
+++ b/trunk/drivers/net/e1000/e1000_main.c
@@ -4193,6 +4193,7 @@ e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
 	return 0;
 }
 
+#ifdef CONFIG_PM
 static int
 e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -4289,7 +4290,6 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 	return 0;
 }
 
-#ifdef CONFIG_PM
 static int
 e1000_resume(struct pci_dev *pdev)
 {