diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-06-12 15:06:58 -0400 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-12 15:06:58 -0400 |
| commit | 53eb2fbeb9e68e1a9a23945de8450999c46270ce (patch) | |
| tree | 3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 /drivers/pci/pci-acpi.c | |
| parent | 8344b568f5bdc7ee1bba909de3294c6348c36056 (diff) | |
| parent | 0e6859d49ff194e01afc229c996e3aefca1a0539 (diff) | |
Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next
Diffstat (limited to 'drivers/pci/pci-acpi.c')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 5f96b869a566..056ea80ee27a 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c | |||
| @@ -239,13 +239,11 @@ EXPORT_SYMBOL(pci_osc_control_set); | |||
| 239 | * choose highest power _SxD or any lower power | 239 | * choose highest power _SxD or any lower power |
| 240 | */ | 240 | */ |
| 241 | 241 | ||
| 242 | static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev, | 242 | static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev) |
| 243 | pm_message_t state) | ||
| 244 | { | 243 | { |
| 245 | int acpi_state; | 244 | int acpi_state; |
| 246 | 245 | ||
| 247 | acpi_state = acpi_pm_device_sleep_state(&pdev->dev, | 246 | acpi_state = acpi_pm_device_sleep_state(&pdev->dev, NULL); |
| 248 | device_may_wakeup(&pdev->dev), NULL); | ||
| 249 | if (acpi_state < 0) | 247 | if (acpi_state < 0) |
| 250 | return PCI_POWER_ERROR; | 248 | return PCI_POWER_ERROR; |
| 251 | 249 | ||