aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-07-07 20:56:40 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:23:43 -0400
commit2a569579be87b5ba61f9b6c54fd5f9f307c53962 (patch)
tree6cc12f2384d235e87941a85a925618c10b419c7f /drivers/net/skge.c
parente8af300c3bd87b2310f1e7a642f37e0fe49a754b (diff)
[PATCH] pm: more u32 vs. pm_message_t fixes
Few more u32 vs. pm_message_t fixes. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/skge.c')
-rw-r--r--drivers/net/skge.c4
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
3262static int skge_suspend(struct pci_dev *pdev, u32 state) 3262static 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