diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 17:44:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-02 17:44:29 -0800 |
| commit | 080a62e2ceec28163194facb837d6388983aae5d (patch) | |
| tree | c39ea5bd760383e2300057adcc112ea3be6ce4a4 /arch | |
| parent | 8a7eab2b54b349d005181fd971cfa027b1976c7b (diff) | |
| parent | 812089e01b9f65f90fc8fc670d8cce72a0e01fbb (diff) | |
| download | linux-rpi3-080a62e2ceec28163194facb837d6388983aae5d.tar.gz linux-rpi3-080a62e2ceec28163194facb837d6388983aae5d.tar.bz2 linux-rpi3-080a62e2ceec28163194facb837d6388983aae5d.zip | |
Merge tag '3.8-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI updates from Bjorn Helgaas:
"Some fixes for v3.8. They include a fix for the new SR-IOV sysfs
management support, an expanded quirk for Ricoh SD card readers, a
Stratus DMI quirk fix, and a PME polling fix."
* tag '3.8-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Reduce Ricoh 0xe822 SD card reader base clock frequency to 50MHz
PCI/PM: Do not suspend port if any subordinate device needs PME polling
PCI: Add PCIe Link Capability link speed and width names
PCI: Work around Stratus ftServer broken PCIe hierarchy (fix DMI check)
PCI: Remove spurious error for sriov_numvfs store and simplify flow
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/pci/common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 1b1dda90a945..412e1286d1fc 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -434,7 +434,8 @@ static const struct dmi_system_id __devinitconst pciprobe_dmi_table[] = { .callback = set_scan_all, .ident = "Stratus/NEC ftServer", .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ftServer"), + DMI_MATCH(DMI_SYS_VENDOR, "Stratus"), + DMI_MATCH(DMI_PRODUCT_NAME, "ftServer"), }, }, {} |