* [PATCH 2.6.20-rc5 3/4] atl1: properly use CONFIG_PM
@ 2007-01-28 0:12 Jay Cliburn
0 siblings, 0 replies; only message in thread
From: Jay Cliburn @ 2007-01-28 0:12 UTC (permalink / raw)
To: jeff; +Cc: csnook, netdev, linux-kernel, atl1-devel, akpm
From: Jay Cliburn <jacliburn@bellsouth.net>
Fix power management by properly using ifdef CONFIG_PM. Discovered by
and modification suggested by Andrew Morton.
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
---
drivers/net/atl1/atl1_main.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index a9e02d1..1045325 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -2345,6 +2345,7 @@ static void __devexit atl1_remove(struct pci_dev *pdev)
pci_disable_device(pdev);
}
+#ifdef CONFIG_PM
static int atl1_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct net_device *netdev = pci_get_drvdata(pdev);
@@ -2438,6 +2439,10 @@ static int atl1_resume(struct pci_dev *pdev)
return 0;
}
+#else
+#define atl1_suspend NULL
+#define atl1_resume NULL
+#endif
static struct pci_driver atl1_driver = {
.name = atl1_driver_name,
@@ -2446,10 +2451,8 @@ static struct pci_driver atl1_driver = {
.remove = __devexit_p(atl1_remove),
/* Power Managment Hooks */
/* probably broken right now -- CHS */
-#ifdef CONFIG_PM
.suspend = atl1_suspend,
.resume = atl1_resume
-#endif
};
/**
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2007-01-28 0:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-28 0:12 [PATCH 2.6.20-rc5 3/4] atl1: properly use CONFIG_PM Jay Cliburn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).