diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
| commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
| tree | 0a7d407639876e02deef1721817615eaa8c673a3 /drivers/net/skge.c | |
| parent | beffbdc2211826b174c68307b1b48c93c05d7ded (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/skge.c')
| -rw-r--r-- | drivers/net/skge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 3dbb1cb09ed8..5cacc7ad9e79 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
| @@ -3259,7 +3259,7 @@ static void __devexit skge_remove(struct pci_dev *pdev) | |||
| 3259 | } | 3259 | } |
| 3260 | 3260 | ||
| 3261 | #ifdef CONFIG_PM | 3261 | #ifdef CONFIG_PM |
| 3262 | static int skge_suspend(struct pci_dev *pdev, u32 state) | 3262 | static int skge_suspend(struct pci_dev *pdev, pm_message_t state) |
| 3263 | { | 3263 | { |
| 3264 | struct skge_hw *hw = pci_get_drvdata(pdev); | 3264 | struct skge_hw *hw = pci_get_drvdata(pdev); |
| 3265 | int i, wol = 0; | 3265 | int i, wol = 0; |
| @@ -3279,7 +3279,7 @@ static int skge_suspend(struct pci_dev *pdev, u32 state) | |||
| 3279 | } | 3279 | } |
| 3280 | 3280 | ||
| 3281 | pci_save_state(pdev); | 3281 | pci_save_state(pdev); |
| 3282 | pci_enable_wake(pdev, state, wol); | 3282 | pci_enable_wake(pdev, pci_choose_state(pdev, state), wol); |
| 3283 | pci_disable_device(pdev); | 3283 | pci_disable_device(pdev); |
| 3284 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); | 3284 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); |
| 3285 | 3285 | ||