projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa05e1a
)
e1000e: Fix build with CONFIG_PM disabled.
author
David S. Miller
<davem@davemloft.net>
Wed, 17 Mar 2010 06:36:24 +0000
(23:36 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 17 Mar 2010 06:36:24 +0000
(23:36 -0700)
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e1000e/netdev.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/net/e1000e/netdev.c
b/drivers/net/e1000e/netdev.c
index 79b33c512dfdf68ca956c9ec5814a6a5fbe76855..b96532a3832285bca406d53ac5fdc176eae6b444 100644
(file)
--- a/
drivers/net/e1000e/netdev.c
+++ b/
drivers/net/e1000e/netdev.c
@@
-5475,6
+5475,7
@@
static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
};
MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
+#ifdef CONFIG_PM
static const struct dev_pm_ops e1000_pm_ops = {
.suspend = e1000_suspend,
.resume = e1000_resume,
@@
-5486,6
+5487,7
@@
static const struct dev_pm_ops e1000_pm_ops = {
.runtime_resume = e1000_runtime_resume,
.runtime_idle = e1000_idle,
};
+#endif
/* PCI Device API Driver */
static struct pci_driver e1000_driver = {