[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4B8C378B.2090400@oracle.com>
Date: Mon, 01 Mar 2010 13:54:19 -0800
From: Randy Dunlap <randy.dunlap@...cle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
Maxim Levitsky <maximlevitsky@...il.com>,
"Rafael J. Wysocki" <rjw@...k.pl>,
David Woodhouse <dwmw2@...radead.org>,
linux-mtd@...ts.infradead.org
Subject: [PATCH -next] mtd/nand/r852: fix build for CONFIG_PM=n
From: Randy Dunlap <randy.dunlap@...cle.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@...cle.com>
Cc: Maxim Levitsky <maximlevitsky@...il.com>
Cc: "Rafael J. Wysocki" <rjw@...k.pl>
Cc: David Woodhouse <dwmw2@...radead.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists