From 56f470cdea58f92dbf90cbbd11d6855afafdcb8c Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Mon, 17 Sep 2007 09:08:49 +0000
Subject: [PATCH] Include e1000_suspend() in #ifdef CONFIG_PM.
---
devices/e1000/e1000_main-2.6.13-ethercat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/devices/e1000/e1000_main-2.6.13-ethercat.c b/devices/e1000/e1000_main-2.6.13-ethercat.c
index 65f901f8..fd024754 100644
--- a/devices/e1000/e1000_main-2.6.13-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.13-ethercat.c
@@ -164,8 +164,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, uint32_t state);
#ifdef CONFIG_PM
+static int e1000_suspend(struct pci_dev *pdev, uint32_t state);
static int e1000_resume(struct pci_dev *pdev);
#endif
@@ -3760,6 +3760,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, uint32_t state)
{
@@ -3853,7 +3854,6 @@ e1000_suspend(struct pci_dev *pdev, uint32_t state)
return 0;
}
-#ifdef CONFIG_PM
static int
e1000_resume(struct pci_dev *pdev)
{
--
GitLab