aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-22 18:19:22 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-22 18:19:22 -0700
commit380bab10de09c22c813ae83f8e148f5a46c1de40 (patch)
tree9deef2961e44d80d4c295f5eeba04ddf6f589dc5
parent7cf75262a4aafe1483349e897bf905e121314dff (diff)
parentd6f8aa8586dabe605454f3c98a5c1a577c3e0cfb (diff)
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
-rw-r--r--drivers/net/atl1e/atl1e_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 367c7275063..35264c244cf 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -2073,7 +2073,6 @@ static int atl1e_close(struct net_device *netdev)
return 0;
}
-#ifdef CONFIG_PM
static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct net_device *netdev = pci_get_drvdata(pdev);
@@ -2207,6 +2206,7 @@ suspend_exit:
return 0;
}
+#ifdef CONFIG_PM
static int atl1e_resume(struct pci_dev *pdev)
{
struct net_device *netdev = pci_get_drvdata(pdev);