Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

17 years ago · 380bab10de
parent 7cf75262a4 d6f8aa8586
commit 380bab10de
1 changed files with 1 additions and 1 deletions
--- 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);