From a6dd3980497854fef54213624f45fbaf62b9c486 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 19 Sep 2008 16:14:24 -0700
Subject: [PATCH] --- yaml --- r: 111684 b: refs/heads/master c:
 04da2cf9bb133355b7073be25ef3ce88c8edc135 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/qlge/qlge_main.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8970b718eefd..a83145df6b92 100644
--- 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
index ad878e2b9ded..3af822b6226e 100644
--- 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)
 {