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

380bab10 · David S. Miller · 7cf75262 · d6f8aa85 · 380bab10
Commit 380bab10 authored Jul 22, 2008 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/net/atl1e/atl1e_main.c drivers/net/atl1e/atl1e_main.c +1 -1

No files found.
--- 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);