diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-22 21:19:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-22 21:19:22 -0400 |
| commit | 380bab10de09c22c813ae83f8e148f5a46c1de40 (patch) | |
| tree | 9deef2961e44d80d4c295f5eeba04ddf6f589dc5 /drivers | |
| parent | 7cf75262a4aafe1483349e897bf905e121314dff (diff) | |
| parent | d6f8aa8586dabe605454f3c98a5c1a577c3e0cfb (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 367c72750635..35264c244cfd 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) | |||
| 2073 | return 0; | 2073 | return 0; |
| 2074 | } | 2074 | } |
| 2075 | 2075 | ||
| 2076 | #ifdef CONFIG_PM | ||
| 2077 | static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state) | 2076 | static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state) |
| 2078 | { | 2077 | { |
| 2079 | struct net_device *netdev = pci_get_drvdata(pdev); | 2078 | struct net_device *netdev = pci_get_drvdata(pdev); |
| @@ -2207,6 +2206,7 @@ suspend_exit: | |||
| 2207 | return 0; | 2206 | return 0; |
| 2208 | } | 2207 | } |
| 2209 | 2208 | ||
| 2209 | #ifdef CONFIG_PM | ||
| 2210 | static int atl1e_resume(struct pci_dev *pdev) | 2210 | static int atl1e_resume(struct pci_dev *pdev) |
| 2211 | { | 2211 | { |
| 2212 | struct net_device *netdev = pci_get_drvdata(pdev); | 2212 | struct net_device *netdev = pci_get_drvdata(pdev); |