---

yaml --- r: 111684 b: refs/heads/master c: 04da2cf h: refs/heads/master v: v3
git-mirror · Sep 19, 2008 · a6dd398 · a6dd398
1 parent 90d67a9
commit a6dd398
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53159d06cb07517422f977591264ca9bf806febb
+refs/heads/master: 04da2cf9bb133355b7073be25ef3ce88c8edc135
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
@@ -3893,6 +3893,7 @@ static int qlge_suspend(struct pci_dev *pdev, pm_message_t state)
 	return 0;
 }
 
+#ifdef CONFIG_PM
 static int qlge_resume(struct pci_dev *pdev)
 {
 	struct net_device *ndev = pci_get_drvdata(pdev);
@@ -3921,6 +3922,7 @@ static int qlge_resume(struct pci_dev *pdev)
 
 	return 0;
 }
+#endif /* CONFIG_PM */
 
 static void qlge_shutdown(struct pci_dev *pdev)
 {