linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	Maxim Levitsky <maximlevitsky@gmail.com>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	David Woodhouse <dwmw2@infradead.org>,
	linux-mtd@lists.infradead.org
Subject: [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n
Date: Mon, 01 Mar 2010 13:54:19 -0800	[thread overview]
Message-ID: <4B8C378B.2090400@oracle.com> (raw)
In-Reply-To: <20100301210210.c6f465e6.sfr@canb.auug.org.au>

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix r852 build for the case of CONFIG_PM=n.

drivers/mtd/nand/r852.c:1039: error: implicit declaration of function 'pci_prepare_to_sleep'
drivers/mtd/nand/r852.c:1048: error: implicit declaration of function 'pci_back_from_sleep'

This patch leaves r852_pm_ops untouched.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: David Woodhouse <dwmw2@infradead.org>
---
 drivers/mtd/nand/r852.c |    5 +++++
 1 file changed, 5 insertions(+)

--- linux-next-20100301.orig/drivers/mtd/nand/r852.c
+++ linux-next-20100301/drivers/mtd/nand/r852.c
@@ -1007,6 +1007,7 @@ void r852_shutdown(struct pci_dev *pci_d
 	pci_disable_device(pci_dev);
 }
 
+#ifdef CONFIG_PM
 int r852_suspend(struct device *device)
 {
 	struct r852_device *dev = pci_get_drvdata(to_pci_dev(device));
@@ -1081,6 +1082,10 @@ int r852_resume(struct device *device)
 	r852_update_card_detect(dev);
 	return 0;
 }
+#else
+#define r852_suspend	NULL
+#define r852_resume	NULL
+#endif
 
 static const struct pci_device_id r852_pci_id_tbl[] = {
 

-- 
~Randy

  parent reply	other threads:[~2010-03-01 21:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-01 10:02 linux-next: Tree for March 1 Stephen Rothwell
2010-03-01 21:08 ` linux-next: Tree for March 1 (bluetooth/hci_sysfs) Randy Dunlap
2010-03-02  1:15   ` Stephen Rothwell
     [not found]     ` <20100302121526.36a1ea88.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2010-03-02  2:14       ` David Miller
     [not found]         ` <20100301.181415.266447389.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2010-03-02  7:06           ` Marcel Holtmann
2010-03-03  1:23         ` Marcel Holtmann
2010-03-01 21:54 ` Randy Dunlap [this message]
2010-03-02 12:02   ` [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n Maxim Levitsky
2010-03-11 16:29     ` Randy Dunlap
2010-03-11 16:34       ` Randy Dunlap
2010-03-11 17:10         ` [PATCH -next] mtd/nand/r852: fix build for CONFIG_PCI disabled Randy Dunlap
2010-03-11 20:59           ` Maxim Levitsky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B8C378B.2090400@oracle.com \
    --to=randy.dunlap@oracle.com \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=linux-next@vger.kernel.org \
    --cc=maximlevitsky@gmail.com \
    --cc=rjw@sisk.pl \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).