diff --git a/[refs] b/[refs]
index 8022f04eed40..42a4e14d8617 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cbaa330f1022abfc7419aaa11ee1a9291f0beb0
+refs/heads/master: 95047dd6d00ad00e7f1f632db6b8ecaa704cfc7e
diff --git a/trunk/drivers/net/wireless/orinoco_pci.h b/trunk/drivers/net/wireless/orinoco_pci.h
index b05a9a5b1f5f..4e8da4ea29f1 100644
--- a/trunk/drivers/net/wireless/orinoco_pci.h
+++ b/trunk/drivers/net/wireless/orinoco_pci.h
@@ -44,6 +44,7 @@ static inline void orinoco_pci_setup_netdev(struct net_device *dev,
 	       pci_name(pdev), pdev->irq, range_type, start, end);
 }
 
+#ifdef CONFIG_PM
 static int orinoco_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
@@ -121,5 +122,9 @@ static int orinoco_pci_resume(struct pci_dev *pdev)
 
 	return 0;
 }
+#else
+#define orinoco_pci_suspend NULL
+#define orinoco_pci_resume NULL
+#endif
 
 #endif /* _ORINOCO_PCI_H */