Patchwork [net-next-2.6,1/2] jme: Fix compile warning introduced by new pm macro

login
register
mail settings
Submitter Guo-Fu Tseng
Date June 28, 2011, 5:23 a.m.
Message ID <1309238615-25590-1-git-send-email-cooldavid@cooldavid.org>
Download mbox | patch
Permalink /patch/102323/
State Accepted
Delegated to: David Miller
Headers show

Comments

Guo-Fu Tseng - June 28, 2011, 5:23 a.m.
From: Guo-Fu Tseng <cooldavid@cooldavid.org>

SIMPLE_DEV_PM_OPS is using SET_SYSTEM_SLEEP_PM_OPS
and SET_SYSTEM_SLEEP_PM_OPS is empty when CONFIG_PM_SLEEP
is not defined.

Switching #ifdef CONFIG_PM to #ifdef CONFIG_PM_SLEEP

Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
---
 drivers/net/jme.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - July 1, 2011, 6:54 a.m.
From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
Date: Tue, 28 Jun 2011 13:23:34 +0800

> From: Guo-Fu Tseng <cooldavid@cooldavid.org>
> 
> SIMPLE_DEV_PM_OPS is using SET_SYSTEM_SLEEP_PM_OPS
> and SET_SYSTEM_SLEEP_PM_OPS is empty when CONFIG_PM_SLEEP
> is not defined.
> 
> Switching #ifdef CONFIG_PM to #ifdef CONFIG_PM_SLEEP
> 
> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>

Applied
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index b5b174a..2ce9339 100644
--- a/drivers/net/jme.c
+++ b/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);