summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAshutosh Naik <ashutosh_naik@adaptec.com>2005-10-28 15:14:53 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-10-28 19:06:44 -0400
commit977e74b5f60de3df9831897b726c16870878eee4 (patch)
treec5fe78bf8b9aaf393cee878aaf89241fe40f8ba5 /drivers/net
parent2c36ed22c6f64de94c6c3b7258dd7285bb093401 (diff)
downloadlinux-977e74b5f60de3df9831897b726c16870878eee4.tar.gz
linux-977e74b5f60de3df9831897b726c16870878eee4.tar.bz2
linux-977e74b5f60de3df9831897b726c16870878eee4.zip
[PATCH] e1000: Fixes e1000_suspend warning when CONFIG_PM is not enabled
drivers/net/e1000/e1000_main.c:3645: warning: `e1000_suspend' defined but not used Signed-off-by: Ashutosh Naik <ashutosh_naik@adaptec.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.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 d97ad89f5dd2..efbbda7cbcbf 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -191,8 +191,8 @@ static void e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid);
static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid);
static void e1000_restore_vlan(struct e1000_adapter *adapter);
-static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
#ifdef CONFIG_PM
+static int e1000_suspend(struct pci_dev *pdev, pm_message_t state);
static int e1000_resume(struct pci_dev *pdev);
#endif