git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
[pandora-kernel.git]
/
drivers
/
pci
/
pci-acpi.c
diff --git
a/drivers/pci/pci-acpi.c
b/drivers/pci/pci-acpi.c
index
7c3b18e
..
d36f41e
100644
(file)
--- a/
drivers/pci/pci-acpi.c
+++ b/
drivers/pci/pci-acpi.c
@@
-195,6
+195,8
@@
static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
return PCI_D2;
case ACPI_STATE_D3:
return PCI_D3hot;
+ case ACPI_STATE_D3_COLD:
+ return PCI_D3cold;
}
return PCI_POWER_ERROR;
}