diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-21 03:53:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-21 03:53:04 +0200 |
| commit | 17eea0df5f7068fc04959e655ef8f0a0ed097e19 (patch) | |
| tree | d44b5cceb813dddfd1e62fe9f92556cf113d62fd /drivers/pci | |
| parent | ipv6/exthdrs: strict Pad1 and PadN check (diff) | |
| parent | Linux 3.4 (diff) | |
| download | linux-17eea0df5f7068fc04959e655ef8f0a0ed097e19.tar.xz linux-17eea0df5f7068fc04959e655ef8f0a0ed097e19.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index 1929c0c63b75..61e2fefeedab 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -223,7 +223,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state) [PCI_D0] = ACPI_STATE_D0, [PCI_D1] = ACPI_STATE_D1, [PCI_D2] = ACPI_STATE_D2, - [PCI_D3hot] = ACPI_STATE_D3_HOT, + [PCI_D3hot] = ACPI_STATE_D3, [PCI_D3cold] = ACPI_STATE_D3 }; int error = -EINVAL; |