bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include e1000_suspend() in #ifdef CONFIG_PM.

This commit is contained in:
Florian Pose 2007-09-17 09:08:49 +00:00
parent e591d5a48d
commit b4880eee0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devices/e1000/e1000_main-2.6.13-ethercat.c
View File

@ -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)
{