summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/mrst.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-08-01 12:40:02 +0200
committerNeilBrown <neilb@suse.de>2012-08-01 12:40:02 +0200
commitbb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch)
tree191bc24dd97bcb174535cc217af082f16da3b43d /arch/x86/pci/mrst.c
parentmd/RAID1: Add missing case for attempting to repair known bad blocks. (diff)
parentdm raid: move sectors_per_dev calculation (diff)
downloadlinux-bb181e2e48f8c85db08c9cb015cbba9618dbf05c.tar.xz
linux-bb181e2e48f8c85db08c9cb015cbba9618dbf05c.zip
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'arch/x86/pci/mrst.c')
-rw-r--r--arch/x86/pci/mrst.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
index 140942f66b31..e14a2ff708b5 100644
--- a/arch/x86/pci/mrst.c
+++ b/arch/x86/pci/mrst.c
@@ -264,7 +264,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, pci_d3delay_fixup);
static void __devinit mrst_power_off_unused_dev(struct pci_dev *dev)
{
- pci_set_power_state(dev, PCI_D3cold);
+ pci_set_power_state(dev, PCI_D3hot);
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0801, mrst_power_off_unused_dev);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0809, mrst_power_off_unused_dev);