---

yaml --- r: 10941 b: refs/heads/master c: b6a1d5f h: refs/heads/master i: 10939: 70e82a3 v: v3
git-mirror · Oct 28, 2005 · 050d002 · 050d002
1 parent f737e7d
commit 050d002
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)
 {