summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/r852.c
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-03-01 13:54:19 -0800
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-03-08 18:32:05 -0800
commitb2aaf7a2b476820cf5fd7738e8641ed88046acf5 (patch)
tree0eca6c852eefd9193befb2ed75243d82a48abd34 /drivers/mtd/nand/r852.c
parentfb45d3232c641bfee5000c8a81e2005903734702 (diff)
downloadlinux-b2aaf7a2b476820cf5fd7738e8641ed88046acf5.tar.gz
linux-b2aaf7a2b476820cf5fd7738e8641ed88046acf5.tar.bz2
linux-b2aaf7a2b476820cf5fd7738e8641ed88046acf5.zip
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>
Diffstat (limited to 'drivers/mtd/nand/r852.c')
-rw-r--r--drivers/mtd/nand/r852.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mtd/nand/r852.c b/drivers/mtd/nand/r852.c
index cb271167b4a5..96db476ce3ed 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[] = {