From patchwork Tue Jan 3 17:34:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Halperin X-Patchwork-Id: 134045 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 20EA7B6FA8 for ; Wed, 4 Jan 2012 04:34:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754267Ab2ACRev (ORCPT ); Tue, 3 Jan 2012 12:34:51 -0500 Received: from mail-vw0-f46.google.com ([209.85.212.46]:39688 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754136Ab2ACReu convert rfc822-to-8bit (ORCPT ); Tue, 3 Jan 2012 12:34:50 -0500 Received: by vbbfc26 with SMTP id fc26so12694069vbb.19 for ; Tue, 03 Jan 2012 09:34:50 -0800 (PST) Received: by 10.52.33.239 with SMTP id u15mr24856673vdi.49.1325612089933; Tue, 03 Jan 2012 09:34:49 -0800 (PST) Received: from dhm.dyn.cs.washington.edu (dhm.dyn.cs.washington.edu. [128.208.4.231]) by mx.google.com with ESMTPS id d4sm35584482vdf.2.2012.01.03.09.34.48 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jan 2012 09:34:49 -0800 (PST) From: Daniel Halperin Subject: [PATCH] skge: fix warning when CONFIG_PM is defined but not CONFIG_PM_SLEEP Date: Tue, 3 Jan 2012 09:34:48 -0800 Message-Id: Cc: shemminger@linux-foundation.org To: netdev@vger.kernel.org Mime-Version: 1.0 (Apple Message framework v1251.1) X-Mailer: Apple Mail (2.1251.1) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org drivers/net/ethernet/marvell/skge.c:4046: warning: ‘skge_suspend’ defined but not used drivers/net/ethernet/marvell/skge.c:4071: warning: ‘skge_resume’ defined but not used Signed-off-by: Daniel Halperin Cc: Stephen Hemminger --- drivers/net/ethernet/marvell/skge.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index dea0cb4..e6a007a 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/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) {