From 7043347723b9114644f0bcff7422230d17cc33d1 Mon Sep 17 00:00:00 2001
From: Guo-Fu Tseng <cooldavid@cooldavid.org>
Date: Mon, 27 Jun 2011 19:23:34 +0000
Subject: [PATCH] --- yaml --- r: 255996 b: refs/heads/master c:
 aab6fb82b1912a312f7547c92ac8d4ecb072e807 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/jme.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 11a2b66818d2..455f822fa6e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b21f3c7ed98a153865a7094af7d85d84c188667e
+refs/heads/master: aab6fb82b1912a312f7547c92ac8d4ecb072e807
diff --git a/trunk/drivers/net/jme.c b/trunk/drivers/net/jme.c
index b5b174a8c149..2ce93393320c 100644
--- a/trunk/drivers/net/jme.c
+++ b/trunk/drivers/net/jme.c
@@ -3135,7 +3135,7 @@ jme_shutdown(struct pci_dev *pdev)
 	pci_pme_active(pdev, true);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int jme_suspend(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);