Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/ker…

…nel/git/jgarzik/netdev-2.6
mariux64 · Jul 23, 2008 · 380bab1 · 380bab1
2 parents 7cf7526 + d6f8aa8
commit 380bab1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
 	return 0;
 }
 
+#ifdef CONFIG_PM
 static int atl1e_resume(struct pci_dev *pdev)
 {
 	struct net_device *netdev = pci_get_drvdata(pdev);