summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-03-18 15:55:17 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-03-18 15:55:17 +1100
commitcf832d845e4d1ade42593597ea0135cc64f909fd (patch)
tree7d1240814553f1eef170fb27d0b68466d40a1586
parentb50936e01b2eba171dcf645a0dd1140eda83ef88 (diff)
Revert "e1000e: Fix build with CONFIG_PM disabled."
This reverts commit e50208a080a8abdfa6c85865362a1cf329e9fe31.
-rw-r--r--drivers/net/e1000e/netdev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index b96532a38322..79b33c512dfd 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -5475,7 +5475,6 @@ 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,
@@ -5487,7 +5486,6 @@ 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 = {