From 779885d008308a42e05b5dd313c3f8a7631fdaa0 Mon Sep 17 00:00:00 2001
From: Daniel Halperin <dhalperi@cs.washington.edu>
Date: Tue, 3 Jan 2012 13:53:16 -0500
Subject: [PATCH] --- yaml --- r: 279171 b: refs/heads/master c:
 faa85aa24286a9e14ae7cc797352350c3ac39986 h: refs/heads/master i:   279169:
 1ffc64133ad870da716268382580a4c3735f8052   279167:
 c0b1871e1c5a252701dd2573cc2916408ca0d629 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/ethernet/marvell/skge.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 089a652d2b51..e129c3bc1d79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86d8c07ff2448eb4e860e50f34ef6ee78e45c40c
+refs/heads/master: faa85aa24286a9e14ae7cc797352350c3ac39986
diff --git a/trunk/drivers/net/ethernet/marvell/skge.c b/trunk/drivers/net/ethernet/marvell/skge.c
index b3f636813089..18a87a57fc0a 100644
--- a/trunk/drivers/net/ethernet/marvell/skge.c
+++ b/trunk/drivers/net/ethernet/marvell/skge.c
@@ -4042,7 +4042,7 @@ static void __devexit skge_remove(struct pci_dev *pdev)
 	pci_set_drvdata(pdev, NULL);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int skge_suspend(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
@@ -4104,7 +4104,7 @@ static SIMPLE_DEV_PM_OPS(skge_pm_ops, skge_suspend, skge_resume);
 #else
 
 #define SKGE_PM_OPS NULL
-#endif
+#endif /* CONFIG_PM_SLEEP */
 
 static void skge_shutdown(struct pci_dev *pdev)
 {