From patchwork Tue Jun 28 05:23:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo-Fu Tseng X-Patchwork-Id: 102323 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AC6E7B6F6C for ; Tue, 28 Jun 2011 15:28:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756450Ab1F1FZb (ORCPT ); Tue, 28 Jun 2011 01:25:31 -0400 Received: from cooldavid.org ([114.33.45.68]:42197 "EHLO cooldavid.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755577Ab1F1FXn (ORCPT ); Tue, 28 Jun 2011 01:23:43 -0400 Received: from tp (111-250-44-115.dynamic.hinet.net [111.250.44.115]) by cooldavid.org (Postfix) with SMTP id B4E5C275C23; Tue, 28 Jun 2011 13:23:40 +0800 (CST) Received: by tp (sSMTP sendmail emulation); Tue, 28 Jun 2011 13:23:41 +0800 From: "Guo-Fu Tseng" To: "David Miller" Cc: Guo-Fu Tseng , "linux-netdev" , "Aries Lee" , "Devinchiu" Subject: [PATCH net-next-2.6 1/2] jme: Fix compile warning introduced by new pm macro Date: Tue, 28 Jun 2011 13:23:34 +0800 Message-Id: <1309238615-25590-1-git-send-email-cooldavid@cooldavid.org> X-Mailer: git-send-email 1.7.3.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Guo-Fu Tseng 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 --- drivers/net/jme.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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);