Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 01:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] fix pm_message_t stuff in -mm tree

Browse Source 
This should bits from -mm tree that are affected by pm_message_t
conversion.  [I'm not 100% sure I got all of them, but I certainly got all
the errors on make allyesconfig build, and most of warnings, too.  I'll go
through the buildlog tommorow and fix any remaining bits].

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pavel Machek 2005-09-03 15:56:58 -07:00 committed by Linus Torvalds
parent ca078bae81
commit 583a4e88db
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/hostap/hostap_pci.c
View File

@ -416,7 +416,7 @@ static int prism2_pci_suspend(struct pci_dev *pdev, pm_message_t state)
prism2_suspend(dev);
pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, 3);
pci_set_power_state(pdev, PCI_D3hot);
return 0;
}

4
drivers/net/wireless/ipw2200.c
View File

@ -7225,7 +7225,7 @@ static void ipw_pci_remove(struct pci_dev *pdev)
#ifdef CONFIG_PM
static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
static int ipw_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct ipw_priv *priv = pci_get_drvdata(pdev);
struct net_device *dev = priv->net_dev;
@ -7240,7 +7240,7 @@ static int ipw_pci_suspend(struct pci_dev *pdev, u32 state)
pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, state);
pci_set_power_state(pdev, pci_choose_state(pdev, state));
return 0;
}