Skip to content

L
linux-davinci
Commit 380bab10 authored by David S. Miller's avatar David S. Miller
Browse files
Options

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

parents 7cf75262 d6f8aa85
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/net/atl1e/atl1e_main.c
View file @ 380bab10
...@@ -2073,7 +2073,6 @@ static int atl1e_close(struct net_device *netdev) ...@@ -2073,7 +2073,6 @@ static int atl1e_close(struct net_device *netdev)
return 0; return 0;
} }
#ifdef CONFIG_PM
static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state) static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = pci_get_drvdata(pdev);
...@@ -2207,6 +2206,7 @@ suspend_exit: ...@@ -2207,6 +2206,7 @@ suspend_exit:
return 0; return 0;
} }
#ifdef CONFIG_PM
static int atl1e_resume(struct pci_dev *pdev) static int atl1e_resume(struct pci_dev *pdev)
{ {
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = pci_get_drvdata(pdev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment