From a2d9f2ecfe9086a32ba17b456150630c45143cc1 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 1 May 2006 02:13:30 -0400 Subject: [PATCH] --- yaml --- r: 27347 b: refs/heads/master c: 95047dd6d00ad00e7f1f632db6b8ecaa704cfc7e h: refs/heads/master i: 27345: 7c8095185ac49f00c68f89092bd618bd002a7d31 27343: c1c46580f6d50955acc692d5cd30ee81213a3abc v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/orinoco_pci.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 */