projects
/
platform
/
kernel
/
linux-arm64.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
7cf7526
)
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
author
David S. Miller
<davem@davemloft.net>
Wed, 23 Jul 2008 01:19:22 +0000
(18:19 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 23 Jul 2008 01:19:22 +0000
(18:19 -0700)
drivers/net/atl1e/atl1e_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/atl1e/atl1e_main.c
b/drivers/net/atl1e/atl1e_main.c
index
367c727
..
35264c2
100644
(file)
--- 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);