aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorMartin J. Bligh <mbligh@mbligh.org>2005-10-28 18:14:44 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-28 19:06:42 -0400
commitb6a1d5f88473138497d8694ddf174e8e91300068 (patch)
tree30d0b9771aae18d62c927cd257643a034f02bacb /drivers/net/e1000
parent596c96ba06e5d56e72451e02f93f4e15e17458df (diff)
[PATCH] e1000: remove warning about e1000_suspend
e1000_suspend is only used under #ifdef CONFIG_PM. Move the declaration of it to be the same way, just like e1000_resume, otherwise gcc whines on compile. I offer as evidence: static struct pci_driver e1000_driver = { .name = e1000_driver_name, .id_table = e1000_pci_tbl, .probe = e1000_probe, .remove = __devexit_p(e1000_remove), /* Power Managment Hooks */ #ifdef CONFIG_PM .suspend = e1000_suspend, .resume = e1000_resume #endif }; Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 6b72f6acdd54..a0023f357cb1 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4193,6 +4193,7 @@ e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx)
4193 return 0; 4193 return 0;
4194} 4194}
4195 4195
4196#ifdef CONFIG_PM
4196static int 4197static int
4197e1000_suspend(struct pci_dev *pdev, pm_message_t state) 4198e1000_suspend(struct pci_dev *pdev, pm_message_t state)
4198{ 4199{
@@ -4289,7 +4290,6 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state)
4289 return 0; 4290 return 0;
4290} 4291}
4291 4292
4292#ifdef CONFIG_PM
4293static int 4293static int
4294e1000_resume(struct pci_dev *pdev) 4294e1000_resume(struct pci_dev *pdev)
4295{ 4295{