diff options
| author | Martin J. Bligh <mbligh@mbligh.org> | 2005-10-28 15:14:44 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 19:06:42 -0400 |
| commit | b6a1d5f88473138497d8694ddf174e8e91300068 (patch) | |
| tree | 30d0b9771aae18d62c927cd257643a034f02bacb /drivers/net | |
| parent | 596c96ba06e5d56e72451e02f93f4e15e17458df (diff) | |
| download | kernel_samsung_crespo-b6a1d5f88473138497d8694ddf174e8e91300068.zip kernel_samsung_crespo-b6a1d5f88473138497d8694ddf174e8e91300068.tar.gz kernel_samsung_crespo-b6a1d5f88473138497d8694ddf174e8e91300068.tar.bz2 | |
[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')
| -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 6b72f6a..a0023f3 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) return 0; } +#ifdef CONFIG_PM static int e1000_suspend(struct pci_dev *pdev, pm_message_t state) { @@ -4289,7 +4290,6 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state) return 0; } -#ifdef CONFIG_PM static int e1000_resume(struct pci_dev *pdev) { |