Message ID | 20100316.234100.133957798.davem@davemloft.net |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
David Miller wrote: > 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 But then the driver build fails again when CONFIG_PM_RUNTIME is not set. drivers/net/e1000e/netdev.c: In function `e1000_runtime_resume`: drivers/net/e1000e/netdev.c:4807: error: `struct dev_pm_info` has no member named `runtime_auto` Thanks, Emil-- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: "Tantilov, Emil S" <emil.s.tantilov@intel.com> Date: Wed, 17 Mar 2010 11:57:59 -0600 > But then the driver build fails again when CONFIG_PM_RUNTIME is not set. > > drivers/net/e1000e/netdev.c: In function `e1000_runtime_resume`: > drivers/net/e1000e/netdev.c:4807: error: `struct dev_pm_info` has no member named `runtime_auto` Ugh, can someone send me a fix for that? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday 17 March 2010, David Miller wrote: > From: "Tantilov, Emil S" <emil.s.tantilov@intel.com> > Date: Wed, 17 Mar 2010 11:57:59 -0600 > > > But then the driver build fails again when CONFIG_PM_RUNTIME is not set. > > > > drivers/net/e1000e/netdev.c: In function `e1000_runtime_resume`: > > drivers/net/e1000e/netdev.c:4807: error: `struct dev_pm_info` has no member named `runtime_auto` > > Ugh, can someone send me a fix for that? I will in a while. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 = {
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(-)