From: Andrew Morton <akpm@osdl.org>

Cc: Tobias Diedrich <ranma@tdiedrich.de> sayeth:
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc; Jeff Garzik <jeff@garzik.org>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Ayaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/net/forcedeth.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff -puN drivers/net/forcedeth.c~forcedeth-power-management-support-tidy drivers/net/forcedeth.c
--- a/drivers/net/forcedeth.c~forcedeth-power-management-support-tidy
+++ a/drivers/net/forcedeth.c
@@ -4603,9 +4603,7 @@ static void __devexit nv_remove(struct p
 	pci_set_drvdata(pci_dev, NULL);
 }
 
-
 #ifdef CONFIG_PM
-
 static int nv_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
@@ -4644,7 +4642,9 @@ static int nv_resume(struct pci_dev *pde
 out:
 	return rc;
 }
-
+#else
+#define nv_suspend NULL
+#define nv_resume NULL
 #endif /* CONFIG_PM */
 
 static struct pci_device_id pci_tbl[] = {
@@ -4748,13 +4748,10 @@ static struct pci_driver driver = {
 	.id_table = pci_tbl,
 	.probe = nv_probe,
 	.remove = __devexit_p(nv_remove),
-#ifdef CONFIG_PM
-	.suspend	= nv_suspend,
-	.resume		= nv_resume,
-#endif
+	.suspend = nv_suspend,
+	.resume	= nv_resume,
 };
 
-
 static int __init init_nic(void)
 {
 	printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION);
_