# HG changeset patch # User Florian Pose # Date 1190020129 0 # Node ID f188f8a0cafd49c5f2eb85d186037c838c38d6af # Parent 0fd652c48e3f0221ff982f6fbfa942eedd73796f Include e1000_suspend() in #ifdef CONFIG_PM. diff -r 0fd652c48e3f -r f188f8a0cafd devices/e1000/e1000_main-2.6.13-ethercat.c --- a/devices/e1000/e1000_main-2.6.13-ethercat.c Thu Sep 13 11:07:19 2007 +0000 +++ b/devices/e1000/e1000_main-2.6.13-ethercat.c Mon Sep 17 09:08:49 2007 +0000 @@ -164,8 +164,8 @@ static void e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid); static void e1000_restore_vlan(struct e1000_adapter *adapter); +#ifdef CONFIG_PM static int e1000_suspend(struct pci_dev *pdev, uint32_t state); -#ifdef CONFIG_PM static int e1000_resume(struct pci_dev *pdev); #endif @@ -3760,6 +3760,7 @@ return 0; } +#ifdef CONFIG_PM static int e1000_suspend(struct pci_dev *pdev, uint32_t state) { @@ -3853,7 +3854,6 @@ return 0; } -#ifdef CONFIG_PM static int e1000_resume(struct pci_dev *pdev) {