diff --git a/[refs] b/[refs]
index b027d886fb28..09411f8286ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb45d3232c641bfee5000c8a81e2005903734702
+refs/heads/master: b2aaf7a2b476820cf5fd7738e8641ed88046acf5
diff --git a/trunk/drivers/mtd/nand/r852.c b/trunk/drivers/mtd/nand/r852.c
index cb271167b4a5..96db476ce3ed 100644
--- a/trunk/drivers/mtd/nand/r852.c
+++ b/trunk/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[] = {