diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-06-12 21:06:58 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-12 21:06:58 +0200 |
| commit | 53eb2fbeb9e68e1a9a23945de8450999c46270ce (patch) | |
| tree | 3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 /drivers/pci/pci-acpi.c | |
| parent | PCI: ACPI PCI slot detection driver (diff) | |
| parent | ACPI PM: Remove obsolete Toshiba workaround (diff) | |
| download | linux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.tar.xz linux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.zip | |
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); * choose highest power _SxD or any lower power */ -static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev, - pm_message_t state) +static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev) { int acpi_state; - acpi_state = acpi_pm_device_sleep_state(&pdev->dev, - device_may_wakeup(&pdev->dev), NULL); + acpi_state = acpi_pm_device_sleep_state(&pdev->dev, NULL); if (acpi_state < 0) return PCI_POWER_ERROR; |