From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 1 Mar 2010 21:54:19 +0000 (-0800)
Subject: mtd/nand/r852: fix build for CONFIG_PM=n
X-Git-Tag: v2.6.35-rc1~465^2~83
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=b2aaf7a2b476820cf5fd7738e8641ed88046acf5;p=net-next-2.6.git

mtd/nand/r852: fix build for CONFIG_PM=n

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>
Acked-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index cb271167b4a..96db476ce3e 100644
--- a/drivers/mtd/nand/r852.c
+++ b/drivers/mtd/nand/r852.c
@@ -1019,6 +1019,7 @@ void r852_shutdown(struct pci_dev *pci_dev)
 	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));
@@ -1093,6 +1094,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[] = {