diff options
author | Auke Kok <auke\-jan.h.kok@intel.com> | 2006-09-27 15:53:19 -0400 |
---|---|---|
committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-09-27 15:53:19 -0400 |
commit | c4e24f01f18f6cea422552caec2fdbf5765a7c7c (patch) | |
tree | bb4277f21ce10c59fdf3270c870806bcc747c7dc /drivers/net | |
parent | 0eb5a34cdf34ad07b6db2df1e523aaf6574601b4 (diff) |
e1000: keep .suspend and .resume driver methods in CONFIG_PM
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index bd673802e8ce..0aaf9afe31ec 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -211,9 +211,9 @@ static struct pci_driver e1000_driver = { | |||
211 | .id_table = e1000_pci_tbl, | 211 | .id_table = e1000_pci_tbl, |
212 | .probe = e1000_probe, | 212 | .probe = e1000_probe, |
213 | .remove = __devexit_p(e1000_remove), | 213 | .remove = __devexit_p(e1000_remove), |
214 | #ifdef CONFIG_PM | ||
214 | /* Power Managment Hooks */ | 215 | /* Power Managment Hooks */ |
215 | .suspend = e1000_suspend, | 216 | .suspend = e1000_suspend, |
216 | #ifdef CONFIG_PM | ||
217 | .resume = e1000_resume, | 217 | .resume = e1000_resume, |
218 | #endif | 218 | #endif |
219 | .shutdown = e1000_shutdown, | 219 | .shutdown = e1000_shutdown, |