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

davem330 · davem330 · commit 380bab10de09 · 2008-07-22T18:19:22.000-07:00
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);

Original file line number	Diff line number	Diff line change
`@@ -2073,7 +2073,6 @@ static int atl1e_close(struct net_device *netdev)`
`2073`	`2073`	`return 0;`
`2074`	`2074`	`}`
`2075`	`2075`
`2076`		`-#ifdef CONFIG_PM`
`2077`	`2076`	`static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)`
`2078`	`2077`	`{`
`2079`	`2078`	`struct net_device *netdev = pci_get_drvdata(pdev);`
`@@ -2207,6 +2206,7 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)`
`2207`	`2206`	`return 0;`
`2208`	`2207`	`}`
`2209`	`2208`
	`2209`	`+#ifdef CONFIG_PM`
`2210`	`2210`	`static int atl1e_resume(struct pci_dev *pdev)`
`2211`	`2211`	`{`
`2212`	`2212`	`struct net_device *netdev = pci_get_drvdata(pdev);`