From patchwork Tue Jun 28 05:12:45 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: 102321 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 C030AB6F6F for ; Tue, 28 Jun 2011 15:16:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756473Ab1F1FNM (ORCPT ); Tue, 28 Jun 2011 01:13:12 -0400 Received: from cooldavid.org ([114.33.45.68]:51886 "EHLO cooldavid.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755856Ab1F1FMt (ORCPT ); Tue, 28 Jun 2011 01:12:49 -0400 Received: from tp (111-250-44-115.dynamic.hinet.net [111.250.44.115]) by cooldavid.org (Postfix) with SMTP id 7A4CD247C6A; Tue, 28 Jun 2011 13:12:45 +0800 (CST) Received: by tp (sSMTP sendmail emulation); Tue, 28 Jun 2011 13:12:46 +0800 From: "Guo-Fu Tseng" To: "David Miller" Cc: Guo-Fu Tseng , "linux-netdev" , "Aries Lee" , "Devinchiu" , Subject: [PATCH net-2.6] jme: Fix compile warning introduced by new pm macro Date: Tue, 28 Jun 2011 13:12:45 +0800 Message-Id: <1309237965-25102-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 Cc: stable@kernel.org --- 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);