From: David Miller <davem@davemloft.net>
To: rjw@sisk.pl
Cc: netdev@vger.kernel.org
Subject: e1000e: Fix build with CONFIG_PM disabled.
Date: Tue, 16 Mar 2010 23:41:00 -0700 (PDT) [thread overview]
Message-ID: <20100316.234100.133957798.davem@davemloft.net> (raw)
I had to add the following patch to fix the build after
your changes.
Thanks.
e1000e: Fix build with CONFIG_PM disabled.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/e1000e/netdev.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 79b33c5..b96532a 100644
--- 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 = {
--
1.6.6.1
next reply other threads:[~2010-03-17 6:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-17 6:41 David Miller [this message]
2010-03-17 17:57 ` e1000e: Fix build with CONFIG_PM disabled Tantilov, Emil S
2010-03-17 18:17 ` David Miller
2010-03-17 20:34 ` Rafael J. Wysocki
2010-03-17 22:39 ` Rafael J. Wysocki
2010-03-17 23:37 ` Jesse Brandeburg
2010-03-17 23:51 ` Rafael J. Wysocki
2010-03-18 6:11 ` David Miller
2010-03-18 6:12 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100316.234100.133957798.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=rjw@sisk.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).